diff options
| author | jlam <jlam> | 2004-11-12 16:27:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-12 16:27:57 +0000 |
| commit | 5f76be9020a1a1f4e5d6b5df1ba05fcf21b7fcc8 (patch) | |
| tree | 4eaa0b7ce8931cf896a860ad8d5bc74733177e33 /mk/wrapper | |
| parent | 1028950d6374175cdcbc7e9679867c673b56cee5 (diff) | |
| download | pkgsrc-5f76be9020a1a1f4e5d6b5df1ba05fcf21b7fcc8.tar.gz | |
Insert the default values for WRAPPER_DEBUG and WRAPPER_UPDATE_CACHE as
defaults within the wrapper script. This avoids requiring those two
variables to be defined in the shell environment for the correct defaults
to take effect.
Diffstat (limited to 'mk/wrapper')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 4 | ||||
| -rw-r--r-- | mk/wrapper/wrapper.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index c287d6659b7..f53563d67b9 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.10 2004/10/14 20:22:21 tv Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.11 2004/11/12 16:27:57 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -310,6 +310,8 @@ _WRAP_SUBST_SED.${_wrappee_}= \ -e "s|@_WRAP_SKIP_TRANSFORM@|${_WRAP_SKIP_TRANSFORM.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_TRANSFORM@|${_WRAP_TRANSFORM.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \ + -e "s|@WRAPPER_DEBUG@|${WRAPPER_DEBUG}|g" \ + -e "s|@WRAPPER_UPDATE_CACHE@|${WRAPPER_UPDATE_CACHE}|g" \ ${_WRAP_SUBST_SED} _WRAP_COOKIE.${_wrappee_}= ${WRAPPER_DIR}/.wrapper_${_wrappee_}_done diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh index 37be69e51fa..d1459d8051f 100644 --- a/mk/wrapper/wrapper.sh +++ b/mk/wrapper/wrapper.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: wrapper.sh,v 1.3 2004/09/23 03:59:01 jlam Exp $ +# $NetBSD: wrapper.sh,v 1.4 2004/11/12 16:27:57 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,7 +52,7 @@ transform="@_WRAP_TRANSFORM@" transform_sed="@_WRAP_TRANSFORM_SED@" wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}" skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}" -debug="${WRAPPER_DEBUG-no}" +debug="${WRAPPER_DEBUG-@WRAPPER_DEBUG@}" append_extra_args=yes cat="@CAT@" @@ -64,7 +64,7 @@ Xsed="$sed -e 1s/^X//" . $shell_lib -updatecache=${WRAPPER_UPDATE_CACHE-yes} +updatecache=${WRAPPER_UPDATE_CACHE-@WRAPPER_UPDATE_CACHE@} reorder=${WRAPPER_REORDER-no} case $debug in |