Module Name: src
Committed By: christos
Date: Mon Jan 25 00:43:00 UTC 2010
Modified Files:
src/share/mk: bsd.dep.mk bsd.kernobj.mk bsd.lib.mk bsd.obj.mk
bsd.own.mk
Log Message:
PR/42658: Geoff Wing: Quote directory variables to deal with spaces in the
source pathname.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.12 -r1.13 src/share/mk/bsd.kernobj.mk
cvs rdiff -u -r1.302 -r1.303 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.48 -r1.49 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.614 -r1.615 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.68 src/share/mk/bsd.dep.mk:1.69
--- src/share/mk/bsd.dep.mk:1.68 Sat Oct 25 18:27:36 2008
+++ src/share/mk/bsd.dep.mk Sun Jan 24 19:43:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.68 2008/10/25 22:27:36 apb Exp $
+# $NetBSD: bsd.dep.mk,v 1.69 2010/01/25 00:43:00 christos Exp $
##### Basic targets
cleandir: cleandepend
@@ -74,7 +74,7 @@
.if !target(tags)
tags: ${SRCS}
.if defined(SRCS)
- -cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
${TOOL_SED} "s;\${.CURDIR}/;;" > tags
.endif
.endif
Index: src/share/mk/bsd.kernobj.mk
diff -u src/share/mk/bsd.kernobj.mk:1.12 src/share/mk/bsd.kernobj.mk:1.13
--- src/share/mk/bsd.kernobj.mk:1.12 Sat Oct 11 04:05:57 2003
+++ src/share/mk/bsd.kernobj.mk Sun Jan 24 19:43:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kernobj.mk,v 1.12 2003/10/11 08:05:57 lukem Exp $
+# $NetBSD: bsd.kernobj.mk,v 1.13 2010/01/25 00:43:00 christos Exp $
# KERNSRCDIR Is the location of the top of the kernel src.
# It defaults to `${NETBSDSRCDIR}/sys'.
@@ -22,5 +22,5 @@
KERNARCHDIR?= arch/${MACHINE}
KERNCONFDIR?= ${KERNSRCDIR}/${KERNARCHDIR}/conf
.if !defined(KERNOBJDIR) && exists(${KERNSRCDIR}/${KERNARCHDIR}/compile)
-KERNOBJDIR!= cd ${KERNSRCDIR}/${KERNARCHDIR}/compile && ${PRINTOBJDIR}
+KERNOBJDIR!= cd "${KERNSRCDIR}/${KERNARCHDIR}/compile" && ${PRINTOBJDIR}
.endif
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.302 src/share/mk/bsd.lib.mk:1.303
--- src/share/mk/bsd.lib.mk:1.302 Wed Dec 30 07:34:13 2009
+++ src/share/mk/bsd.lib.mk Sun Jan 24 19:43:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.302 2009/12/30 12:34:13 abs Exp $
+# $NetBSD: bsd.lib.mk,v 1.303 2010/01/25 00:43:00 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -52,7 +52,7 @@
.if defined(LIBDPLIBS) && ${MKPIC} != "no" # {
.for _lib _dir in ${LIBDPLIBS}
.if !defined(LIBDO.${_lib})
-LIBDO.${_lib}!= cd ${_dir} && ${PRINTOBJDIR}
+LIBDO.${_lib}!= cd "${_dir}" && ${PRINTOBJDIR}
.MAKEOVERRIDES+=LIBDO.${_lib}
.endif
LDADD+= -L${LIBDO.${_lib}} -l${_lib}
@@ -84,7 +84,7 @@
.if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
exists(${NETBSDSRCDIR}/lib/checkver)
checkver:
- @(cd ${.CURDIR} && \
+ @(cd "${.CURDIR}" && \
HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
-d ${DESTDIR}${_LIBSODIR} ${LIB})
Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.48 src/share/mk/bsd.obj.mk:1.49
--- src/share/mk/bsd.obj.mk:1.48 Tue Dec 11 09:06:04 2007
+++ src/share/mk/bsd.obj.mk Sun Jan 24 19:43:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.obj.mk,v 1.48 2007/12/11 14:06:04 lukem Exp $
+# $NetBSD: bsd.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
@@ -52,7 +52,7 @@
# In case .CURDIR has been twiddled by a .mk file and is now relative,
# make it absolute again.
.if ${__curdir:M/*} == ""
-__curdir!= cd ${__curdir} && ${PAWD}
+__curdir!= cd "${__curdir}" && ${PAWD}
.endif
__objdir:= ${__objdir}.${HOST_OSTYPE}
@@ -66,7 +66,7 @@
.endif
obj:
- @cd ${__curdir}; \
+ @cd "${__curdir}"; \
here=`${PAWD}`/; subdir=$${here#${BSDSRCDIR}/}; \
if [ "$$here" != "$$subdir" ]; then \
if [ ! -d ${__usrobjdir} ]; then \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.614 src/share/mk/bsd.own.mk:1.615
--- src/share/mk/bsd.own.mk:1.614 Mon Dec 14 00:25:21 2009
+++ src/share/mk/bsd.own.mk Sun Jan 24 19:43:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.614 2009/12/14 05:25:21 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.615 2010/01/25 00:43:00 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -81,7 +81,7 @@
# and setting _SRC_TOP_ to the result.
#
.if !defined(_SRC_TOP_) # {
-_SRC_TOP_!= cd ${.CURDIR}; while :; do \
+_SRC_TOP_!= cd "${.CURDIR}"; while :; do \
here=`pwd`; \
[ -f build.sh ] && [ -d tools ] && { echo $$here; break; }; \
case $$here in /) echo ""; break;; esac; \
@@ -100,7 +100,7 @@
NETBSDSRCDIR?= ${_SRC_TOP_}
.if !defined(_SRC_TOP_OBJ_)
-_SRC_TOP_OBJ_!= cd ${_SRC_TOP_} && ${PRINTOBJDIR}
+_SRC_TOP_OBJ_!= cd "${_SRC_TOP_}" && ${PRINTOBJDIR}
.MAKEOVERRIDES+= _SRC_TOP_OBJ_
.endif
@@ -612,7 +612,7 @@
cleandir: clean
dependall: .NOTMAIN realdepend .MAKE
- @cd ${.CURDIR}; ${MAKE} realall
+ @cd "${.CURDIR}"; ${MAKE} realall
.endif
#
@@ -860,7 +860,7 @@
#
.if !defined(X11SRCDIR)
.if exists(${NETBSDSRCDIR}/../xsrc)
-X11SRCDIR!= cd ${NETBSDSRCDIR}/../xsrc && pwd
+X11SRCDIR!= cd "${NETBSDSRCDIR}/../xsrc" && pwd
.else
X11SRCDIR= /usr/xsrc
.endif
@@ -955,7 +955,7 @@
#
.if !defined(EXTSRCSRCDIR)
.if exists(${NETBSDSRCDIR}/../extsrc)
-EXTSRCSRCDIR!= cd ${NETBSDSRCDIR}/../extsrc && pwd
+EXTSRCSRCDIR!= cd "${NETBSDSRCDIR}/../extsrc" && pwd
.else
EXTSRCSRCDIR= /usr/extsrc
.endif
