Author: bdrewery (ports committer)
Date: Fri Sep 13 11:57:52 2013
New Revision: 255514
URL: http://svnweb.freebsd.org/changeset/base/255514
Log:
MFC r255048:
- Fix LOCAL_MTREE so it properly handles multiple files and quotes
its value into submakes
PR: conf/179466
Submitted by: Garrett Cooper <[email protected]>
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/Makefile.inc1 (contents, props changed)
Directory Properties:
stable/9/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Fri Sep 13 11:25:42 2013 (r255513)
+++ stable/9/Makefile.inc1 Fri Sep 13 11:57:52 2013 (r255514)
@@ -270,7 +270,7 @@ WMAKEENV= ${CROSSENV} \
PATH=${TMPPATH}
# make hierarchy
-HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE}
+HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
.if defined(NO_ROOT)
HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
.endif
@@ -768,7 +768,7 @@ distributeworld installworld: installche
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
- LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
+ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
.endif
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
@@ -814,7 +814,7 @@ reinstall:
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE} hierarchy
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing everything"
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
