svn commit: r194266 - head/usr.bin/chpass

[Ed Schouten]

Author: ed
Date: Mon Jun 15 21:05:00 2009
New Revision: 194266
URL: http://svn.freebsd.org/changeset/base/194266

Log:
  Make the chpass Makefile honour NO_FSCHG.
  
  The chpass Makefile tried to set the fschg flag on the binaries, even if
  NO_FSCHG was passed to the installworld. This meant that if I installed
  FreeBSD into a Jail, I couldn't installworld from within the Jail
  anymore.
  
  Now that it listens to NO_FSCHG, we can just make it bail out when it
  fails, just like PRECIOUSPROG does.

Modified:
  head/usr.bin/chpass/Makefile

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Mon Jun 15 21:03:25 2009	(r194265)
+++ head/usr.bin/chpass/Makefile	Mon Jun 15 21:05:00 2009	(r194266)
@@ -39,11 +39,12 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 yp
 
 beforeinstall:
 .for i in chpass chfn chsh ypchpass ypchfn ypchsh
-	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
-		chflags noschg ${DESTDIR}${BINDIR}/$i || true
+	-chflags noschg ${DESTDIR}${BINDIR}/$i
 .endfor
 
+.if !defined(NO_FSCHG)
 afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/chpass
+	chflags schg ${DESTDIR}${BINDIR}/chpass
+.endif
 
 .include <bsd.prog.mk>