From owner-freebsd-hackers@FreeBSD.ORG  Sun Sep  2 21:46:19 2012
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: hackers@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 276C1106566B;
	Sun,  2 Sep 2012 21:46:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
	[IPv6:2607:fc50:1000:c200::face])
	by mx1.freebsd.org (Postfix) with ESMTP id 00B798FC16;
	Sun,  2 Sep 2012 21:46:19 +0000 (UTC)
Received: from glenbarber.us (75.97.141.105.res-cmts.sewb.ptd.net
	[75.97.141.105])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested) (Authenticated sender: gjb)
	by onyx.glenbarber.us (Postfix) with ESMTPSA id 6078D23F645;
	Sun,  2 Sep 2012 17:46:18 -0400 (EDT)
Date: Sun, 2 Sep 2012 17:46:16 -0400
From: Glen Barber <gjb@FreeBSD.org>
To: hackers@FreeBSD.org
Message-ID: <20120902214616.GB1507@glenbarber.us>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="eRtJSFbw+EEWtPj3"
Content-Disposition: inline
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: 
Subject: [PATCH] head/Makefile.inc1: Fix 'make distributeworld' when defining
 WITHOUT_GAMES
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Sep 2012 21:46:19 -0000


--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--