Date: Fri, 9 Jul 2010 07:56:37 -0700 From: Garrett Cooper <gcooper@FreeBSD.org> To: hackers@freebsd.org Subject: Re: [patch] SUBDIR_OVERRIDE `optimization' Message-ID: <AANLkTim_UM_An_i81IfGZ0q0Y5cLFGpnWoUcTqlj9ODm@mail.gmail.com> In-Reply-To: <AANLkTiknaqqXyq3DoDXahbieessXZNIJUsryKbxI2DJJ@mail.gmail.com> References: <AANLkTiknaqqXyq3DoDXahbieessXZNIJUsryKbxI2DJJ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
(Let's try this again with the right email address)
=A0 =A0Something simple that I noticed a while back when I was reviewing
the Makefile.inc1 code. The SUBDIR_OVERRIDE code is executed after the
conditional feature checks, which sets the value of SUBDIRS to the
user defined value. So instead of going through the conditionals, one
could just cut to the chase and set SUBDIRS to SUBDIRS_OVERRIDE,
otherwise detect the conditional directories to include in
Makefile.inc1.
Thanks!
-Garrett
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 209684)
+++ Makefile.inc1 (working copy)
@@ -41,6 +41,9 @@
# use that new version. And the new (dynamically-linked) /bin/sh
# will expect to find appropriate libraries in /lib and /libexec.
#
+.if defined(SUBDIR_OVERRIDE)
+SUBDIR=3D ${SUBDIR_OVERRIDE}
+.else
SUBDIR=3D share/info lib libexec
SUBDIR+=3Dbin
.if ${MK_GAMES} !=3D "no"
@@ -79,8 +82,6 @@
.endif
.endfor
-.if defined(SUBDIR_OVERRIDE)
-SUBDIR=3D ${SUBDIR_OVERRIDE}
.endif
.if defined(NOCLEAN)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTim_UM_An_i81IfGZ0q0Y5cLFGpnWoUcTqlj9ODm>