Author: ngie
Date: Mon Jul 24 23:57:43 2017
New Revision: 321444
URL: https://svnweb.freebsd.org/changeset/base/321444
Log:
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
Modified:
head/etc/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Mon Jul 24 23:32:46 2017 (r321443)
+++ head/etc/Makefile Mon Jul 24 23:57:43 2017 (r321444)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
