diff options
author | William Hubbs <williamh@gentoo.org> | 2011-01-29 17:32:38 -0600 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2011-01-31 14:05:57 -0600 |
commit | cca7e9f7e1143f3405bc90ff8e2176d82ab491ef (patch) | |
tree | 63fee486bd9b9729b7defc66577daae1fddc1c1b /mk/scripts.mk | |
parent | c2529c1ed61816799dd56bb46699b2b8cf5acb39 (diff) |
use immediate evaluation for shell calls
This reworks the shell calls in the makefiles to use immediate
evaluation and should improve parallel building.
X-Gentoo-Bug: 289264
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=289264
Diffstat (limited to 'mk/scripts.mk')
-rw-r--r-- | mk/scripts.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/scripts.mk b/mk/scripts.mk index bd7ec6bb..3517aabf 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -8,11 +8,11 @@ include ${MK}/os.mk OBJS+= ${SRCS:.in=} _PKG_SED_SH= if test "${PREFIX}" = "${PKG_PREFIX}"; then echo "-e 's:@PKG_PREFIX@::g'"; else echo "-e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'"; fi -_PKG_SED!= ${_PKG_SED_SH} +_PKG_SED:= $(shell ${_PKG_SED_SH}) _LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi -_LCL_SED!= ${_LCL_SED_SH} +_LCL_SED:= $(shell ${_LCL_SED_SH}) -SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED}$(shell ${_PKG_SED_SH}) ${_LCL_SED}$(shell ${_LCL_SED_SH}) +SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED} ${_LCL_SED} # Tweak our shell scripts .SUFFIXES: .sh.in .in |