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.

4 files changed, 16 insertions, 16 deletions

diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index b50dc5361cf..189c7e8156a 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/02/06 02:49:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/02/06 19:04:25 jlam Exp $
 
 GCC_VERSION=	3.3.2
 DISTNAME=	gcc-${GCC_VERSION}
@@ -69,7 +69,7 @@ AS_VERSION!=	${AS} --version | ${AWK} '{				\
 		}'
 USE_BINUTILS!=	${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
 .    endif
-MAKEFLAGS+=	USE_BINUTILS="${USE_BINUTILS}"
+MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
 .  endif
 .endif
 
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"
 #
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 20b0c9d3a97..77f8ffc84e0 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/02/05 08:45:31 uebayasi Exp $
+# $NetBSD: Makefile,v 1.34 2004/02/06 19:04:25 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -170,7 +170,7 @@ _GCC_IS_AT_LEAST_3_3!=	\
 	else								\
 		${ECHO} "NO";						\
 	fi
-MAKEFLAGS+=	_GCC_IS_AT_LEAST_3_3="${_GCC_IS_AT_LEAST_3_3}"
+MAKEFLAGS+=	_GCC_IS_AT_LEAST_3_3=${_GCC_IS_AT_LEAST_3_3}
 .  endif
 .  if !empty(_GCC_IS_AT_LEAST_3_3:M[nN][oO])
 #