diff options
| -rw-r--r-- | etc/Makefile | 8 | ||||
| -rw-r--r-- | libexec/dma/dmagent/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 3 | ||||
| -rw-r--r-- | usr.sbin/ppp/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/ppp/ppp.conf (renamed from etc/ppp/ppp.conf) | 0 |
5 files changed, 6 insertions, 10 deletions
diff --git a/etc/Makefile b/etc/Makefile index 43e6f60..94c4473 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 6baa902..1875177 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -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 diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index ba31e82..f1b0970 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -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 diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index e0772af..1dcd3b5 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -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= diff --git a/etc/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf index 2b63834..2b63834 100644 --- a/etc/ppp/ppp.conf +++ b/usr.sbin/ppp/ppp.conf |
