diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2017-07-24 23:57:43 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2017-07-24 23:57:43 +0000 |
commit | e017348aa84c2191022e1c6b7963966923cd2182 (patch) | |
tree | 8f391518e8835baeddc766c70c2223216ead7723 /etc/Makefile | |
parent | 1ae1311d9c614a58b2c0ebcb8361aae943381e89 (diff) | |
download | src-e017348aa84c2191022e1c6b7963966923cd2182.tar.gz src-e017348aa84c2191022e1c6b7963966923cd2182.zip |
Remove ${MTREE} and leverage etc/mtree/Makefile instead with
"make distribution".
This also fixes the fact that BSD.debug.dist was being installed if/when
${MK_DEBUG_FILES} != "no" before this commit.
MFC after: 2 months
Notes
Notes:
svn path=/head/; revision=321444
Diffstat (limited to 'etc/Makefile')
-rw-r--r-- | etc/Makefile | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/etc/Makefile b/etc/Makefile index 9713c795eae4..0d0f6e8a41a4 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -152,20 +152,6 @@ BIN1+= regdomain.xml # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume -MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist -.if ${MK_LIB32} != "no" -MTREE+= BSD.lib32.dist -.endif -.if ${MK_LIBSOFT} != "no" -MTREE+= BSD.libsoft.dist -.endif -.if ${MK_TESTS} != "no" -MTREE+= BSD.tests.dist -.endif -.if ${MK_SENDMAIL} != "no" -MTREE+= BSD.sendmail.dist -.endif - PPPCNF= ppp.conf .if ${MK_SENDMAIL} == "no" @@ -254,6 +240,7 @@ distribution: ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install .if ${MK_NTP} != "no" ${_+_}cd ${.CURDIR}/ntp; ${MAKE} install @@ -308,8 +295,6 @@ distribution: rm -f ${DESTDIR}/.cshrc; \ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc .endif - cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${MTREE} ${DESTDIR}/etc/mtree .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail |