Date: Mon, 3 Dec 2012 02:25:12 GMT From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/174071: [patch] optimize SUBDIR_OVERRIDE in Makefile.inc1 Message-ID: <201212030225.qB32PC6T063191@red.freebsd.org> Resent-Message-ID: <201212030230.qB32U0Jk096081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174071
>Category: conf
>Synopsis: [patch] optimize SUBDIR_OVERRIDE in Makefile.inc1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 03 02:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: n/a
>Organization:
EMC Isilon
>Environment:
n/a
>Description:
The attached patch optimizes SUBDIR_OVERRIDE so SUBDIRs aren't automatically defined if SUBDIR_OVERRIDE is defined.
Something I submitted many moons ago on hackers@ that never made it into base.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 243802)
+++ Makefile.inc1 (working copy)
@@ -59,6 +59,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= ${SUBDIR_OVERRIDE}
+.else
SUBDIR= share/info lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
@@ -97,9 +100,6 @@
SUBDIR+= ${_DIR}
.endif
.endfor
-
-.if defined(SUBDIR_OVERRIDE)
-SUBDIR= ${SUBDIR_OVERRIDE}
.endif
.if defined(NOCLEAN)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212030225.qB32PC6T063191>