Remove bogus ${DESTDIR}s from LINKS.
Keep DPADD up to date with LDADD. bsd.prog.mk's install rule can't handle schg'ed links, so ugly beforeinstall and afterinstall rules are required.
This commit is contained in:
parent
9566ef5108
commit
c555738304
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=10091
@ -6,15 +6,17 @@ BINOWN= root
|
||||
BINMODE=4555
|
||||
.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../usr.sbin/vipw
|
||||
CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../usr.sbin/vipw
|
||||
LINKS= ${DESTDIR}${BINDIR}/chpass ${DESTDIR}${BINDIR}/chfn
|
||||
LINKS+= ${DESTDIR}${BINDIR}/chpass ${DESTDIR}${BINDIR}/chsh
|
||||
LINKS+= ${DESTDIR}${BINDIR}/chpass ${DESTDIR}${BINDIR}/ypchpass
|
||||
LINKS+= ${DESTDIR}${BINDIR}/chpass ${DESTDIR}${BINDIR}/ypchfn
|
||||
LINKS+= ${DESTDIR}${BINDIR}/chpass ${DESTDIR}${BINDIR}/ypchsh
|
||||
LINKS= ${BINDIR}/chpass ${BINDIR}/chfn
|
||||
LINKS+= ${BINDIR}/chpass ${BINDIR}/chsh
|
||||
LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass
|
||||
LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn
|
||||
LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchsh
|
||||
MLINKS= chpass.1 chfn.1 chpass.1 chsh.1
|
||||
COPTS+=-DYP
|
||||
SRCS+= pw_yp.c
|
||||
LDADD+=-lrpcsvc -lcrypt
|
||||
COPTS+= -DYP
|
||||
SRCS+= pw_yp.c
|
||||
DPADD= ${LIBRPCSVC} ${LIBCRYPT}
|
||||
LDADD+= -lrpcsvc -lcrypt
|
||||
|
||||
beforeinstall:
|
||||
[ ! -e ${DESTDIR}${BINDIR}/chpass ] || \
|
||||
chflags noschg ${DESTDIR}${BINDIR}/chpass
|
||||
|
@ -1,8 +1,9 @@
|
||||
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
|
||||
# $Id: Makefile,v 1.14 1995/06/11 19:32:12 rgrimes Exp $
|
||||
# $Id: Makefile,v 1.15 1995/08/13 16:07:28 wpaul Exp $
|
||||
|
||||
PROG= passwd
|
||||
SRCS= local_passwd.c yp_passwd.c passwd.c pw_copy.c pw_util.c
|
||||
DPADD= ${LIBCRYPT} ${LIBRPCSVC}
|
||||
LDADD= -lcrypt -lrpcsvc
|
||||
.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
|
||||
${.CURDIR}/../rlogin
|
||||
@ -13,7 +14,7 @@ CFLAGS+=-DCRYPT -DYP -I${.CURDIR} -I${.CURDIR}/../../usr.sbin/vipw \
|
||||
BINOWN= root
|
||||
BINMODE=4555
|
||||
MAN1=passwd.1
|
||||
LINKS=${DESTDIR}${BINDIR}/passwd ${DESTDIR}${BINDIR}/yppasswd
|
||||
LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
|
||||
MLINKS=passwd.1 yppasswd.1
|
||||
|
||||
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES))
|
||||
@ -25,6 +26,8 @@ SRCS+= kpasswd.c
|
||||
CFLAGS+= -DKERBEROS \
|
||||
-I${.CURDIR}/../../eBones/include \
|
||||
-I${.CURDIR}/../../eBones/libkadm
|
||||
# XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
|
||||
DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR}
|
||||
LDADD= -lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err
|
||||
DISTRIBUTION= krb
|
||||
.endif
|
||||
@ -32,6 +35,7 @@ DISTRIBUTION= krb
|
||||
beforeinstall:
|
||||
[ ! -e ${DESTDIR}${BINDIR}/passwd ] || \
|
||||
chflags noschg ${DESTDIR}${BINDIR}/passwd
|
||||
|
||||
afterinstall:
|
||||
chflags schg ${DESTDIR}${BINDIR}/passwd
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user