[pkgsrc/trunk]: pkgsrc/mk If we're passing through MAKEFLAGS variables whose ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75b0ce3b607a
branches:  trunk
changeset: 467787:75b0ce3b607a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 06 18:45:02 2004 +0000

description:
If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
fixes breakage when executing the just-in-time su targetes.

diffstat:

 mk/bsd.pkg.mk                   |  10 +++++-----
 mk/buildlink3/bsd.buildlink3.mk |   4 ++--
 mk/compiler/gcc.mk              |   6 +++---
 mk/krb5.buildlink3.mk           |   6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (103 lines):

diff -r 3b54b2878fd9 -r 75b0ce3b607a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Feb 06 18:44:46 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Feb 06 18:45:02 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1375 2004/02/06 03:10:29 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1376 2004/02/06 18:45:02 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -304,9 +304,9 @@
 PERL5_SITELIB:=                ${PERL5_SITELIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
 PERL5_SITEARCH:=       ${PERL5_SITEARCH:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
 PERL5_ARCHLIB:=                ${PERL5_ARCHLIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-MAKEFLAGS+=            PERL5_SITELIB="${PERL5_SITELIB}"
-MAKEFLAGS+=            PERL5_SITEARCH="${PERL5_SITEARCH}"
-MAKEFLAGS+=            PERL5_ARCHLIB="${PERL5_ARCHLIB}"
+MAKEFLAGS+=            PERL5_SITELIB=${PERL5_SITELIB:Q}
+MAKEFLAGS+=            PERL5_SITEARCH=${PERL5_SITEARCH:Q}
+MAKEFLAGS+=            PERL5_ARCHLIB=${PERL5_ARCHLIB:Q}
 .      endif # PKG_INSTALLATION_TYPE == "overwrite"
 .    endif   # exists($PERL5)
 .  endif     # !defined(PERL5_*)
@@ -1342,7 +1342,7 @@
 
 .include "../../mk/tools.mk"
 
-MAKEFLAGS+=    PREPEND_PATH="${PREPEND_PATH}"
+MAKEFLAGS+=    PREPEND_PATH=${PREPEND_PATH:Q}
 
 .MAIN: all
 
diff -r 3b54b2878fd9 -r 75b0ce3b607a mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Feb 06 18:44:46 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Fri Feb 06 18:45:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.77 2004/02/06 04:37:02 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.78 2004/02/06 18:45:03 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -713,7 +713,7 @@
                else                                                    \
                        ${ECHO} ${WRKDIR};                              \
                fi
-MAKEFLAGS+=    _BLNK_WRKDIR="${_BLNK_WRKDIR}"
+MAKEFLAGS+=    _BLNK_WRKDIR=${_BLNK_WRKDIR:Q}
 .endif
 
 _BLNK_MANGLE_DIRS=     # empty
diff -r 3b54b2878fd9 -r 75b0ce3b607a mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Fri Feb 06 18:44:46 2004 +0000
+++ b/mk/compiler/gcc.mk        Fri Feb 06 18:45:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.40 2004/02/06 04:38:10 jlam Exp $
+# $NetBSD: gcc.mk,v 1.41 2004/02/06 18:45:03 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       one
@@ -28,7 +28,7 @@
 .      endif
 .    endfor
 .    if !empty(_CC:M/*)
-MAKEFLAGS+=    _CC="${_CC}"
+MAKEFLAGS+=    _CC=${_CC:Q}
 .    endif
 .  endif
 
@@ -196,7 +196,7 @@
        else                                                            \
                ${ECHO} "YES";                                          \
        fi
-MAKEFLAGS+=    _NEED_NEWER_GCC="${_NEED_NEWER_GCC}"
+MAKEFLAGS+=    _NEED_NEWER_GCC=${_NEED_NEWER_GCC}
 .  endif
 .  if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && \
     !empty(_NEED_NEWER_GCC:M[yY][eE][sS])
diff -r 3b54b2878fd9 -r 75b0ce3b607a mk/krb5.buildlink3.mk
--- a/mk/krb5.buildlink3.mk     Fri Feb 06 18:44:46 2004 +0000
+++ b/mk/krb5.buildlink3.mk     Fri Feb 06 18:45:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: krb5.buildlink3.mk,v 1.4 2004/02/02 11:34:17 jlam Exp $
+# $NetBSD: krb5.buildlink3.mk,v 1.5 2004/02/06 18:45:03 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Kerberos 5 implementation.  krb5.buildlink3.mk will:
@@ -43,7 +43,7 @@
        else                                                            \
                ${ECHO} "no";                                           \
        fi
-MAKEFLAGS+=    _KRB5_INSTALLED.${_krb5_}="${_KRB5_INSTALLED.${_krb5_}}"
+MAKEFLAGS+=    _KRB5_INSTALLED.${_krb5_}=${_KRB5_INSTALLED.${_krb5_}}
 .    endif
 .  endfor
 
@@ -73,7 +73,7 @@
 _KRB5?=                ${_KRB5_FIRSTACCEPTED}
 .    endif
 _KRB5?=                none
-MAKEFLAGS+=    _KRB5="${_KRB5}"
+MAKEFLAGS+=    _KRB5=${_KRB5}
 .  endif
 
 KRB5_TYPE=     ${_KRB5}