Use PRECIOUSPROG instead of custom code to handle schg

This allows to preserve schg when installed with -DNO_ROOT MFC after: 1 week
kiwichris · Feb 12, 2015 · 8486c03 · 8486c03
1 parent 54f0d78
commit 8486c03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
@@ -9,6 +9,7 @@ PROG=	chpass
 SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
+PRECIOUSPROG=
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
@@ -34,16 +35,4 @@ MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
 MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 .endif
 
-beforeinstall:
-.for i in chpass chfn chsh ypchpass ypchfn ypchsh
-.if exists(${DESTDIR}${BINDIR}/$i)
-	-chflags noschg ${DESTDIR}${BINDIR}/$i
-.endif
-.endfor
-
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/chpass
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
@@ -7,20 +7,10 @@ PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
 LIBADD   = pam
+PRECIOUSPROG=
 .if ${MK_NIS} != "no"
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
 
-beforeinstall:
-.for i in passwd yppasswd
-	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
-		chflags noschg ${DESTDIR}${BINDIR}/$i || true
-.endfor
-
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/passwd
-.endif
-
 .include <bsd.prog.mk>