summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-28 01:15:57 +0000
committergjb <gjb@FreeBSD.org>2016-01-28 01:15:57 +0000
commit780ae7713f72b471859c0997295ac0c59695c7b4 (patch)
tree1558e6d4ff9b09d3e1432c7a72fc811fd945662d
parentf797ddeb13d87b4fdfc115d604520b49548f4ac9 (diff)
downloadFreeBSD-src-780ae7713f72b471859c0997295ac0c59695c7b4.zip
FreeBSD-src-780ae7713f72b471859c0997295ac0c59695c7b4.tar.gz
Ensure mtree(8) recognizes chpass(1) is schg.
Convert hard links to symbolic links, and remove the 'beforeinstall' and 'afterinstall' chflags(8) execution. Sponsored by: The FreeBSD Foundation
-rw-r--r--usr.bin/chpass/Makefile23
1 files changed, 6 insertions, 17 deletions
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 9b3e878..96bbd4b 100644
--- 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
@@ -21,12 +22,12 @@ LIBADD= crypt util
LIBADD+= ypclnt
.endif
-LINKS= ${BINDIR}/chpass ${BINDIR}/chfn
-LINKS+= ${BINDIR}/chpass ${BINDIR}/chsh
+SYMLINKS= ${BINDIR}/chpass ${BINDIR}/chfn
+SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/chsh
.if ${MK_NIS} != "no"
-LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass
-LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn
-LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchsh
+SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass
+SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn
+SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchsh
.endif
MLINKS= chpass.1 chfn.1 chpass.1 chsh.1
@@ -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>
OpenPOWER on IntegriCloud