Date: Mon, 24 Jul 2017 17:17:02 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ngie Cooper <ngie@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r321444 - head/etc Message-ID: <5890e09f-8983-f458-34cf-3107f288edc1@FreeBSD.org> In-Reply-To: <201707242357.v6ONvhJA063824@repo.freebsd.org> References: <201707242357.v6ONvhJA063824@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --flwt2961UI6eu2NGGbsGPu309DjCNILcG Content-Type: multipart/mixed; boundary="BG3wdHEtclulSP5bGKhejlFhf1JbFMC21"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ngie Cooper <ngie@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <5890e09f-8983-f458-34cf-3107f288edc1@FreeBSD.org> Subject: Re: svn commit: r321444 - head/etc References: <201707242357.v6ONvhJA063824@repo.freebsd.org> In-Reply-To: <201707242357.v6ONvhJA063824@repo.freebsd.org> --BG3wdHEtclulSP5bGKhejlFhf1JbFMC21 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 7/24/2017 4:57 PM, Ngie Cooper wrote: > Author: ngie > Date: Mon Jul 24 23:57:43 2017 > New Revision: 321444 > URL: https://svnweb.freebsd.org/changeset/base/321444 >=20 > Log: > Remove ${MTREE} and leverage etc/mtree/Makefile instead with > "make distribution". > =20 > This also fixes the fact that BSD.debug.dist was being installed if/w= hen > ${MK_DEBUG_FILES} !=3D "no" before this commit. This was intentional, see r279248. > =20 > MFC after: 2 months >=20 > Modified: > head/etc/Makefile >=20 > Modified: head/etc/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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+=3D regdomain.xml > # -rwxr-xr-x root:wheel, for the new cron root:wheel > BIN2=3D netstart pccard_ether rc.suspend rc.resume > =20 > -MTREE=3D BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BS= D.var.dist > -.if ${MK_LIB32} !=3D "no" > -MTREE+=3D BSD.lib32.dist > -.endif > -.if ${MK_LIBSOFT} !=3D "no" > -MTREE+=3D BSD.libsoft.dist > -.endif > -.if ${MK_TESTS} !=3D "no" > -MTREE+=3D BSD.tests.dist > -.endif > -.if ${MK_SENDMAIL} !=3D "no" > -MTREE+=3D BSD.sendmail.dist > -.endif > - > PPPCNF=3D ppp.conf > =20 > .if ${MK_SENDMAIL} =3D=3D "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} !=3D "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} !=3D "no" > cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > ${ETCMAIL} ${DESTDIR}/etc/mail >=20 --=20 Regards, Bryan Drewery --BG3wdHEtclulSP5bGKhejlFhf1JbFMC21-- --flwt2961UI6eu2NGGbsGPu309DjCNILcG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZdo3/AAoJEDXXcbtuRpfPUc0H/1mj7Eq6qOqCZ3qaTcgmrniq sIAusYtlG2H87MHEWqlkA/Uj2VZ1h8I7gPkkkUk3BDEicQ96+od6NTvbme3v/D+x 36aXmN0zb8bnliqqMqpXr/K+eU7gUuTY9Va6iv85zp60gSvVPkP40T9E6lS4tu3S 2tg4lNpujsnDv24sL+LqOmGo+Wmxou0CJYNifa21izD8W7ldWJHXyGK+c7alR/7a H6cHsOMcENYsqxDGJlMt8lunnw8Kh6yQa9hBnoIomnSuO+WKTBOB4w9psfkYwa7p SGMhG0piPEYxoOrya/TvwPfZBmUCu2k7tQmtpltkr7It+ycLHLP1l0Oq6f0BaMI= =32SH -----END PGP SIGNATURE----- --flwt2961UI6eu2NGGbsGPu309DjCNILcG--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5890e09f-8983-f458-34cf-3107f288edc1>