Date: Sat, 27 Apr 2013 22:21:43 GMT From: Garrett Cooper <yaneurabeya@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/178209: [PATCH] simplify make hierarchy NO_ROOT logic Message-ID: <201304272221.r3RMLhT9014834@red.freebsd.org> Resent-Message-ID: <201304272230.r3RMU0aj081717@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178209 >Category: conf >Synopsis: [PATCH] simplify make hierarchy NO_ROOT logic >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: Sat Apr 27 22:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 10-CURRENT >Organization: EMC Isilon >Environment: n/a >Description: The attached patch simplifies the make hierarchy rule by putting the bits needed for twiddling make into an HMAKE variable. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (revision 249833) +++ Makefile.inc1 (working copy) @@ -277,6 +277,13 @@ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} + +# make hierarchy +HMAKE= ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +.if defined(NO_ROOT) +HMAKE+= METALOG=${METALOG} -DNO_ROOT +.endif + .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif @@ -1319,12 +1326,7 @@ # hierarchy - ensure that all the needed directories are present # hierarchy hier: -.if defined(NO_ROOT) - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} \ - -DNO_ROOT METALOG=${METALOG} distrib-dirs -.else - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs -.endif + cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304272221.r3RMLhT9014834>