From owner-freebsd-bugs@FreeBSD.ORG  Mon Dec  3 02:30:00 2012
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CEA51BD0
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon,  3 Dec 2012 02:30:00 +0000 (UTC)
 (envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 891468FC14
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon,  3 Dec 2012 02:30:00 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qB32U05J096082
 for <freebsd-bugs@freefall.freebsd.org>; Mon, 3 Dec 2012 02:30:00 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB32U0Jk096081;
 Mon, 3 Dec 2012 02:30:00 GMT (envelope-from gnats)
Resent-Date: Mon, 3 Dec 2012 02:30:00 GMT
Resent-Message-Id: <201212030230.qB32U0Jk096081@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
 Garrett Cooper <yanegomi@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 34E5FBA8
 for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Dec 2012 02:25:13 +0000 (UTC)
 (envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
 by mx1.freebsd.org (Postfix) with ESMTP id 1CBA48FC08
 for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Dec 2012 02:25:13 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
 by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB32PCKK063192
 for <freebsd-gnats-submit@FreeBSD.org>; Mon, 3 Dec 2012 02:25:12 GMT
 (envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
 by red.freebsd.org (8.14.5/8.14.5/Submit) id qB32PC6T063191;
 Mon, 3 Dec 2012 02:25:12 GMT (envelope-from nobody)
Message-Id: <201212030225.qB32PC6T063191@red.freebsd.org>
Date: Mon, 3 Dec 2012 02:25:12 GMT
From: Garrett Cooper <yanegomi@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: conf/174071: [patch] optimize SUBDIR_OVERRIDE in Makefile.inc1
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Dec 2012 02:30:00 -0000


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