diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-06 19:04:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-06 19:04:24 +0000 |
| commit | 7699290f1060509f9b32dff10f411e2e95c11798 (patch) | |
| tree | 9e1ed235761e43178980383a9260a8ca70040dfb /lang/perl5 | |
| parent | ca9cfaafab77ea1327c66314e401682f91707ba0 (diff) | |
| download | pkgsrc-7699290f1060509f9b32dff10f411e2e95c11798.tar.gz | |
If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value. This
avoids breakage when executing the just-in-time su targets.
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/buildlink2.mk | 12 | ||||
| -rw-r--r-- | lang/perl5/buildlink3.mk | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk index 6074c678e05..6e709de4325 100644 --- a/lang/perl5/buildlink2.mk +++ b/lang/perl5/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2004/01/19 23:50:20 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $ .if !defined(PERL5_BUILDLINK2_MK) PERL5_BUILDLINK2_MK= # defined @@ -39,26 +39,26 @@ _PERL5_PREFIX!= \ eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix _PERL5_SITEPREFIX!= \ eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix -MAKEFLAGS+= _PERL5_PREFIX="${_PERL5_PREFIX}" -MAKEFLAGS+= _PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}" +MAKEFLAGS+= _PERL5_PREFIX=${_PERL5_PREFIX:Q} +MAKEFLAGS+= _PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q} . for _var_ in ${_PERL5_SITEVARS} PERL5_SUB_${_var_}!= \ eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`; \ ${ECHO} $${${_PERL5_SITEVAR.${_var_}}} | \ ${SED} -e "s,^${_PERL5_SITEPREFIX}/,," -MAKEFLAGS+= PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}" +MAKEFLAGS+= PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q} . endfor PERL5_SUB_INSTALLARCHLIB!= \ eval `${PERL5} -V:installarchlib 2>/dev/null`; \ ${ECHO} $$installarchlib | \ ${SED} -e "s,^${_PERL5_PREFIX}/,," -MAKEFLAGS+= PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}" +MAKEFLAGS+= PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q} PERL5_SUB_INSTALLSCRIPT!= \ eval `${PERL5} -V:installscript 2>/dev/null`; \ ${ECHO} $$installscript | \ ${SED} -e "s,^${_PERL5_PREFIX}/,," -MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}" +MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q} . endif BUILDLINK_FILES.perl= \ diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index a21424b3487..17b4d4f6e46 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:26:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ @@ -43,26 +43,26 @@ _PERL5_PREFIX!= \ eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix _PERL5_SITEPREFIX!= \ eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix -MAKEFLAGS+= _PERL5_PREFIX="${_PERL5_PREFIX}" -MAKEFLAGS+= _PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}" +MAKEFLAGS+= _PERL5_PREFIX=${_PERL5_PREFIX:Q} +MAKEFLAGS+= _PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q} . for _var_ in ${_PERL5_SITEVARS} PERL5_SUB_${_var_}!= \ eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`; \ ${ECHO} $${${_PERL5_SITEVAR.${_var_}}} | \ ${SED} -e "s,^${_PERL5_SITEPREFIX}/,," -MAKEFLAGS+= PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}" +MAKEFLAGS+= PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q} . endfor PERL5_SUB_INSTALLARCHLIB!= \ eval `${PERL5} -V:installarchlib 2>/dev/null`; \ ${ECHO} $$installarchlib | \ ${SED} -e "s,^${_PERL5_PREFIX}/,," -MAKEFLAGS+= PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}" +MAKEFLAGS+= PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q} PERL5_SUB_INSTALLSCRIPT!= \ eval `${PERL5} -V:installscript 2>/dev/null`; \ ${ECHO} $$installscript | \ ${SED} -e "s,^${_PERL5_PREFIX}/,," -MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}" +MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q} . endif . if ${PKG_INSTALLATION_TYPE} == "overwrite" # |