changeset 510:d6809f73abeb

Fix import of build enironment varables to method understood by both make(1)s.
author Aleksandr Rybalko <ray@ddteam.net>
date Thu, 02 Oct 2014 15:46:50 +0300
parents 70bd01e1b81b
children d9aa67fbc607
files Makefile
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
 #