mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-01 12:19:28 +00:00
Revert r301137 and r301163, and implement a correct fix
for the CONFS issue with dma.conf and ppp.conf. Thank you very much to Bryan Drewery for looking into the problem and providing this fix. Pointyhat: gjb Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
e5f0191f20
commit
ea580d0b45
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=301166
@ -305,14 +305,6 @@ distribution:
|
||||
.endif
|
||||
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${MTREE} ${DESTDIR}/etc/mtree
|
||||
.if ${MK_PPP} != "no"
|
||||
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
|
||||
${PPPCNF} ${DESTDIR}/etc/ppp
|
||||
.endif
|
||||
.if ${MK_DMAGENT} != "no"
|
||||
cd ${.CURDIR}/../libexec/dma/dmagent; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
dma.conf ${DESTDIR}/etc/dma
|
||||
.endif
|
||||
.if ${MK_MAIL} != "no"
|
||||
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
${ETCMAIL} ${DESTDIR}/etc/mail
|
||||
|
@ -18,6 +18,8 @@ SRCS= aliases_parse.y \
|
||||
spool.c \
|
||||
util.c
|
||||
MAN8= dma.8
|
||||
CONFS= dma.conf
|
||||
CONFSDIR= ${CONFDIR}/dma
|
||||
YFLAGS+= -i
|
||||
CLEANFILES= aliases_parse.i
|
||||
FILES= mailer.conf
|
||||
|
@ -72,10 +72,9 @@ DISTRIBUTION?= base
|
||||
distribute: .MAKE
|
||||
.for dist in ${DISTRIBUTION}
|
||||
${_+_}cd ${.CURDIR}; \
|
||||
${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
|
||||
${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
# Convenience targets to run 'build${target}' and 'install${target}' when
|
||||
# calling 'make ${target}'.
|
||||
.for __target in files includes
|
||||
|
@ -21,6 +21,9 @@ PPP_NO_PAM=
|
||||
PPP_NO_RADIUS=
|
||||
PPP_NO_SUID=
|
||||
.endif
|
||||
CONFS= ppp.conf
|
||||
CONFSDIR= ${CONFDIR}/ppp
|
||||
CONFSMODE= 600
|
||||
|
||||
.if ${MK_ATM} == "no"
|
||||
PPP_NO_ATM=
|
||||
|
Loading…
Reference in New Issue
Block a user