Date: Sun, 2 Sep 2012 17:46:16 -0400 From: Glen Barber <gjb@FreeBSD.org> To: hackers@FreeBSD.org Subject: [PATCH] head/Makefile.inc1: Fix 'make distributeworld' when defining WITHOUT_GAMES Message-ID: <20120902214616.GB1507@glenbarber.us>
next in thread | raw e-mail | index | archive | help
--eRtJSFbw+EEWtPj3
Content-Type: multipart/mixed; boundary="GRPZ8SYKNexpdSJ7"
Content-Disposition: inline
--GRPZ8SYKNexpdSJ7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
Attached patch fixes 'make distributeworld' and our 'make release'
scripts when WITHOUT_GAMES is set.
Can someone please comment/test/commit?
Thanks,
Glen
--GRPZ8SYKNexpdSJ7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="head-Makefile.inc1.diff.txt"
Content-Transfer-Encoding: quoted-printable
Index: Makefile.inc1
=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
--- Makefile.inc1 (revision 240060)
+++ Makefile.inc1 (working copy)
@@ -636,7 +636,10 @@
#
=20
# Non-base distributions produced by the base system
-EXTRA_DISTRIBUTIONS=3D doc games
+EXTRA_DISTRIBUTIONS=3D doc
+.if !defined(WITHOUT_GAMES) && !empty(WITHOUT_GAMES)
+EXTRA_DISTRIBUTIONS+=3D games
+.endif
.if defined(LIB32TMP) && ${MK_LIB32} !=3D "no"
EXTRA_DISTRIBUTIONS+=3D lib32
.endif
--GRPZ8SYKNexpdSJ7--
--eRtJSFbw+EEWtPj3
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
iQEcBAEBCAAGBQJQQ9OoAAoJEFJPDDeguUajiLYH/R2bWE/Pmhubruxcpzmanqy1
b54uUxO7zWXk6xfYpIxXYbwqJCkcLP5wPnXSXEb4XhkDt2pabRKiK9A70RQNJdP5
+Nzj2wNM4370/76o0tuQ4HTBZaoWmvYhVkPtOU7DsjS0UXsgk14WMNPVV5m5wMxW
NaYoAGZYVs/gYBlEDsRySBO9XyQ9LWFnAk0xu592ogiS8TndnUkhLxdctHm/W2Wm
e8i4ciVghKaCEB/ICS+v3qJse2JJKJ0APGoIrWMMStGHhyKgSSQmaq05pmixDz4k
I+5Vpcq4yCbd++b5g/3xOpnbxz3i8r+rhJEaEQpLCY4f7ncd8+9sv0KN8QtQk0M=
=H7ug
-----END PGP SIGNATURE-----
--eRtJSFbw+EEWtPj3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120902214616.GB1507>