CVS commit: pkgsrc/devel/zlib

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Jun  8 07:51:33 UTC 2018

Modified Files:
        pkgsrc/devel/zlib: builtin.mk

Log Message:
zlib: Quote BUILDLINK_PREFIX.zlib with `:Q' operator in fake-zlib-pc target

Properly quote BUILDLINK_PREFIX.zlib via the `:Q' operator.

Pointed out by <prlw1> via pkgsrc-changes@ and discussed with
<joerg>, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/zlib/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/zlib/builtin.mk
diff -u pkgsrc/devel/zlib/builtin.mk:1.13 pkgsrc/devel/zlib/builtin.mk:1.14
--- pkgsrc/devel/zlib/builtin.mk:1.13   Tue Apr  4 08:57:33 2017
+++ pkgsrc/devel/zlib/builtin.mk        Fri Jun  8 07:51:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2017/04/04 08:57:33 adam Exp $
+# $NetBSD: builtin.mk,v 1.14 2018/06/08 07:51:33 leot Exp $
 
 BUILTIN_PKG:=  zlib
 
@@ -93,7 +93,7 @@ _FAKE_ZLIB_PC=${BUILDLINK_DIR}/lib/pkgco
 fake-zlib-pc:
        ${RUN}  \
        sedsrc=../../devel/zlib/files/zlib.pc.in;       \
-       src=${BUILDLINK_PREFIX.zlib}/lib${LIBABISUFFIX}/pkgconfig/zlib.pc;\
+       src=${BUILDLINK_PREFIX.zlib:Q}/lib${LIBABISUFFIX}/pkgconfig/zlib.pc;\
        dst=${_FAKE_ZLIB_PC};                                   \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig;\
        if [ ! -f $${dst} ]; then       \
@@ -102,12 +102,12 @@ fake-zlib-pc:
                        ${LN} -sf $${src} $${dst};                      \
                else    \
                        ${ECHO_BUILDLINK_MSG} "Creating $${dst}";       \
-                       ${SED}  -e s,@prefix@,${BUILDLINK_PREFIX.zlib},\
-                                       -e s,@exec_prefix@,${BUILDLINK_PREFIX.zlib},\
-                                       -e s,@libdir@,${BUILDLINK_PREFIX.zlib}/lib${LIBABISUFFIX},\
+                       ${SED}  -e s,@prefix@,${BUILDLINK_PREFIX.zlib:Q},\
+                                       -e s,@exec_prefix@,${BUILDLINK_PREFIX.zlib:Q},\
+                                       -e s,@libdir@,${BUILDLINK_PREFIX.zlib:Q}/lib${LIBABISUFFIX},\
                                        -e s,@VERSION@,${BUILTIN_VERSION.zlib},\
-                                       -e s,@includedir@,${BUILDLINK_PREFIX.zlib}/include,\
-                                       -e s,@sharedlibdir@,${BUILDLINK_PREFIX.zlib}/lib,\
+                                       -e s,@includedir@,${BUILDLINK_PREFIX.zlib:Q}/include,\
+                                       -e s,@sharedlibdir@,${BUILDLINK_PREFIX.zlib:Q}/lib,\
                                $${sedsrc} > $${dst};                   \
                fi      \
        fi