Adjust misleading wording of the -G option and simplify a few

[pw-darwin.git] / chpass / Makefile

diff --git a/chpass/Makefile b/chpass/Makefile
index 7f7ac510c6bcd245af39af0adf9a91e5f7c4894a..9b3e878d8656ad8815492e5b1871ad5d3218a245 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -1,7 +1,7 @@
 #      @(#)Makefile    8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
 
@@ -16,11 +16,9 @@ CFLAGS+= -DYP
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
-DPADD= ${LIBCRYPT} ${LIBUTIL}
-LDADD= -lcrypt -lutil
+LIBADD=        crypt util
 .if ${MK_NIS} != "no"
-DPADD+=        ${LIBYPCLNT}
-LDADD+=        -lypclnt
+LIBADD+=       ypclnt
 .endif 
 
 LINKS= ${BINDIR}/chpass ${BINDIR}/chfn
@@ -38,12 +36,14 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 
 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
+       -chflags schg ${DESTDIR}${BINDIR}/chpass
 .endif
 
 .include <bsd.prog.mk>