From owner-svn-src-stable@freebsd.org Sat Sep 30 20:31:41 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAB93E2ED2B; Sat, 30 Sep 2017 20:31:41 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6377A7F9D9; Sat, 30 Sep 2017 20:31:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8UKVchn036166; Sat, 30 Sep 2017 20:31:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8UKVbG5035943; Sat, 30 Sep 2017 20:31:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709302031.v8UKVbG5035943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 30 Sep 2017 20:31:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r324138 - in stable/11/etc: . mtree X-SVN-Group: stable-11 X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in stable/11/etc: . mtree X-SVN-Commit-Revision: 324138 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Sep 2017 20:31:42 -0000 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 -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