[Zrouter-src] ZRouter.org: push to ZRouter Makefile

zrouter-src at zrouter.org zrouter-src at zrouter.org
Thu Oct 2 12:48:15 UTC 2014


details:   http://zrouter.org/hg/zrouter//rev/d6809f73abeb
changeset: 510:d6809f73abeb
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Thu Oct 02 15:46:50 2014 +0300
description:
Fix import of build enironment varables to method understood by both make(1)s.

diffstat:

 Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 70bd01e1b81b -r d6809f73abeb Makefile
--- a/Makefile	Thu Oct 02 15:44:25 2014 +0300
+++ b/Makefile	Thu Oct 02 15:46:50 2014 +0300
@@ -419,15 +419,15 @@
 WORLD_SUBDIRS+=${SRCROOTUP}/${ZROUTER_ROOT}/${dir}
 .endfor
 
-FREEBSD_BUILD_ENV_VARS!=(MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${MAKE} \
-    ${_WORLD_BUILD_ENV} -C ${FREEBSD_SRC_TREE} buildenvvars)
+FREEBSD_BUILD_ENV_VARS!=(MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${FREEBSD_SRC_MAKE} \
+    ${_WORLD_BUILD_ENV} -C ${FREEBSD_SRC_TREE} buildenvvars | sed 's/^/FREEBSD_BUILD_ENV_/')
 # Import buildenvvars into our namespace with suffix FREEBSD_BUILD_ENV_
 .for var in ${FREEBSD_BUILD_ENV_VARS}
-FREEBSD_BUILD_ENV_${var}
+VAR_LEFT=${var:C/=.*//}
+VAR_RIGHT=${var:C/.*=//}
+${VAR_LEFT}:=${VAR_RIGHT}
 .endfor
 
-
-
 #
 # World
 #


More information about the Zrouter-src mailing list