Wed Dec 2 14:32:15 2009 UTC ()
Quote variable values from make in case it has spaces.  Remove debug print.


(uebayasi)
diff -r1.95 -r1.96 src/distrib/sets/sets.subr
cvs diff -r1.95 -r1.96 src/distrib/sets/sets.subr (expand / switch to unified diff)

--- src/distrib/sets/sets.subr 2009/12/02 14:28:24 1.95
+++ src/distrib/sets/sets.subr 2009/12/02 14:32:15 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sets.subr,v 1.95 2009/12/02 14:28:24 uebayasi Exp $ 1# $NetBSD: sets.subr,v 1.96 2009/12/02 14:32:15 uebayasi Exp $
2# 2#
3 3
4# 4#
5# The following variables contain defaults for sets.subr functions and callers: 5# The following variables contain defaults for sets.subr functions and callers:
6# setsdir path to src/distrib/sets 6# setsdir path to src/distrib/sets
7# nlists list of base sets 7# nlists list of base sets
8# xlists list of x11 sets 8# xlists list of x11 sets
9# extlists list of extsrc sets 9# extlists list of extsrc sets
10# obsolete controls if obsolete files are selected instead 10# obsolete controls if obsolete files are selected instead
11# module if != "no", enable MODULE sets 11# module if != "no", enable MODULE sets
12# shlib shared library format (a.out, elf, or "") 12# shlib shared library format (a.out, elf, or "")
13# stlib static library format (a.out, elf) 13# stlib static library format (a.out, elf)
14# 14#
@@ -134,32 +134,32 @@ MKMANPAGES=yes @@ -134,32 +134,32 @@ MKMANPAGES=yes
134.endif 134.endif
135.if \${MKX11} != "no" 135.if \${MKX11} != "no"
136. if \${X11FLAVOUR} == "Xorg" 136. if \${X11FLAVOUR} == "Xorg"
137MKXORG:=yes 137MKXORG:=yes
138MKX11:=no 138MKX11:=no
139. else 139. else
140MKXORG:=no 140MKXORG:=no
141. endif 141. endif
142.endif 142.endif
143all: 143all:
144.for i in MACHINE MACHINE_ARCH MACHINE_CPU \ 144.for i in MACHINE MACHINE_ARCH MACHINE_CPU \
145 HAVE_BINUTILS HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \ 145 HAVE_BINUTILS HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
146 ${MKEXTRAVARS} \${_MKVARS.yes} \${_MKVARS.no} 146 ${MKEXTRAVARS} \${_MKVARS.yes} \${_MKVARS.no}
147 @echo "export \$i=\${\$i}" 147 @echo "export \$i=\"\${\$i}\""
148.endfor 148.endfor
149 149
150EOMAKE 150EOMAKE
151); do 151); do
152 echo 1>&2 "DEBUG: read $x" 152# echo 1>&2 "DEBUG: read $x"
153 eval $x 153 eval $x
154done 154done
155IFS=$oIFS 155IFS=$oIFS
156 156
157setsdir=${0%/*} 157setsdir=${0%/*}
158obsolete=0 158obsolete=0
159module=yes 159module=yes
160if [ "${MKKMOD}" = "no" ]; then 160if [ "${MKKMOD}" = "no" ]; then
161 module=no # MODULEs are off. 161 module=no # MODULEs are off.
162elif [ "${MACHINE}" = "evbppc" ]; then 162elif [ "${MACHINE}" = "evbppc" ]; then
163 module=no # Turn off MODULEs for some ports. 163 module=no # Turn off MODULEs for some ports.
164fi 164fi
165# Determine lib type. Do this first so stlib also gets set. 165# Determine lib type. Do this first so stlib also gets set.
@@ -187,27 +187,27 @@ extlists="extbase extcomp extetc" @@ -187,27 +187,27 @@ extlists="extbase extcomp extetc"
187OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh` 187OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
188MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules" 188MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
189SUBST="s#@MODULEDIR@#${MODULEDIR}#g" 189SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
190SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g" 190SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
191SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" 191SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
192 192
193# 193#
194# list_set_files setfile [...] 194# list_set_files setfile [...]
195#  195#
196# Produce a packing list for setfile(s). 196# Produce a packing list for setfile(s).
197# In each file, a record consists of a path and a System Package name, 197# In each file, a record consists of a path and a System Package name,
198# separated by whitespace. E.g., 198# separated by whitespace. E.g.,
199# 199#
200# # $NetBSD: sets.subr,v 1.95 2009/12/02 14:28:24 uebayasi Exp $ 200# # $NetBSD: sets.subr,v 1.96 2009/12/02 14:32:15 uebayasi Exp $
201# . base-sys-root [keyword[,...]] 201# . base-sys-root [keyword[,...]]
202# ./altroot base-sys-root 202# ./altroot base-sys-root
203# ./bin base-sys-root 203# ./bin base-sys-root
204# ./bin/[ base-util-root 204# ./bin/[ base-util-root
205# ./bin/cat base-util-root 205# ./bin/cat base-util-root
206# [...] 206# [...]
207# 207#
208# A # in the first column marks a comment. 208# A # in the first column marks a comment.
209# 209#
210# If ${obsolete} != 0, only entries with an "obsolete" keyword will 210# If ${obsolete} != 0, only entries with an "obsolete" keyword will
211# be printed. All other keywords must be present. 211# be printed. All other keywords must be present.
212# 212#
213# The third field is an optional comma separated list of keywords to 213# The third field is an optional comma separated list of keywords to