svn commit: r324138 - in stable/11/etc: . mtree

[Ngie Cooper]

Author: ngie
Date: Sat Sep 30 20:31:37 2017
New Revision: 324138
URL: https://svnweb.freebsd.org/changeset/base/324138

Log:
  MFC r321444,r321446:
  
  r321444:
  
  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.
  
  r321446:
  
  Unconditionally install etc/mtree/BSD.debug.dist again
  
  r279248 unconditionally installed BSD.debug.dist for ease-of-developer-use.
  Restore the previous behavior.
  
  While here, add a comment to note that this is intentional to avoid accidental
  future removal.
  
  MFC with:	r321444

Modified:
  stable/11/etc/Makefile
  stable/11/etc/mtree/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/Makefile
==============================================================================
--- stable/11/etc/Makefile	Sat Sep 30 20:31:27 2017	(r324137)
+++ stable/11/etc/Makefile	Sat Sep 30 20:31:37 2017	(r324138)
@@ -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"
@@ -253,6 +239,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
@@ -306,8 +293,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

Modified: stable/11/etc/mtree/Makefile
==============================================================================
--- stable/11/etc/mtree/Makefile	Sat Sep 30 20:31:27 2017	(r324137)
+++ stable/11/etc/mtree/Makefile	Sat Sep 30 20:31:37 2017	(r324138)
@@ -2,7 +2,9 @@
 
 .include <src.opts.mk>
 
-FILES=	${_BSD.debug.dist} \
+# NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
+FILES=	\
+	BSD.debug.dist \
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.lib32.dist} \
@@ -12,9 +14,6 @@ FILES=	${_BSD.debug.dist} \
 	BSD.usr.dist \
 	BSD.var.dist
 
-.if ${MK_DEBUG_FILES} != "no"
-_BSD.debug.dist=	BSD.debug.dist
-.endif
 .if ${MK_GROFF} != "no"
 _BSD.groff.dist=	BSD.groff.dist
 .endif