[PATCH] head/Makefile.inc1: Fix 'make distributeworld' when defining WITHOUT_GAMES

[Garrett Cooper]

On Sun, Sep 2, 2012 at 3:52 PM, Glen Barber <gjb at freebsd.org> wrote:
> On Sun, Sep 02, 2012 at 03:12:01PM -0700, Garrett Cooper wrote:
>> On Sun, Sep 2, 2012 at 3:05 PM, Garrett Cooper <yanegomi at gmail.com> wrote:
>> > On Sun, Sep 2, 2012 at 2:46 PM, Glen Barber <gjb at freebsd.org> wrote:
>> >> Hi,
>> >>
>> >> Attached patch fixes 'make distributeworld' and our 'make release'
>> >> scripts when WITHOUT_GAMES is set.
>> >>
>> >> Can someone please comment/test/commit?
>> >
>> >     It should be `.if ${MK_GAMES} != "no"`. Other than that, LGTM!
>
> You're right, thanks.  New diff attached.

Cool|! Too bad we don't have a publicly advertised MK_DOC knob --
otherwise doc would be an optional EXTRA_DISTRIBUTION as well (there's
an undocumented NODOC knob in release/Makefile) (yes bde@ -- feel free
to cringe at gmail's suckage with column wrapping).

Index: /usr/src/Makefile.inc1
===================================================================
--- /usr/src/Makefile.inc1      (revision 239292)
+++ /usr/src/Makefile.inc1      (working copy)
@@ -640,7 +640,13 @@
 #

 # Non-base distributions produced by the base system
-EXTRA_DISTRIBUTIONS=   doc games
+EXTRA_DISTRIBUTIONS=
+.if ${MK_DOC} != "no"
+EXTRA_DISTRIBUTIONS+=  doc
+.endif
+.if ${MK_GAMES} != "no"
+EXTRA_DISTRIBUTIONS+=  games
+.endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=  lib32
 .endif

>>     I would also dare to go one step further and remove
>> `${WORLDTMP}/legacy/usr/games` from BPATH and XPATH when ${MK_GAMES}
>> == "no" to reduce the number of path lookups done (this should help
>> speed up the build a bit).
>
> Considering how many problems I am finding in our 'make release' build
> infrastructure, I would rather not do anything daringly right away.  I
> would rather fix the bugs I am finding, be sure things are not broken
> differently, and then we can further fix things.

Sure.

> Thank you for the suggestion.

No problem!

Thanks!
-Garrett