Fixed a bug that prevented the definition of ${ID} to be written into

the example mk.conf.

The explanation for setting DBG to the empty value is written to the
mk.conf file to inform the uninitiated pkgsrc user about its purpose.

1 files changed, 6 insertions, 3 deletions

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 121efb0a5d5..47d3cedfa4e 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.83 2006/09/10 20:14:43 schwarz Exp $
+# $NetBSD: bootstrap,v 1.84 2006/09/18 12:35:44 rillig Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -843,12 +843,15 @@ run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnb
 # preserve compiler and tool environment variables settings
 test -z "$CP" || echo "TOOLS_PLATFORM.cp?=		$CP" >> ${MKCONF_EXAMPLE}
 test -z "$GREP" || echo "TOOLS_PLATFORM.grep?=		$GREP" >> ${MKCONF_EXAMPLE}
-test -z "$ID" || echo "TOOLS_PLATFORM.id?=		$ID" >> {MKCONF_EXAMPLE}
+test -z "$ID" || echo "TOOLS_PLATFORM.id?=		$ID" >> ${MKCONF_EXAMPLE}
 test -z "$MKDIR" || echo "TOOLS_PLATFORM.mkdir?=		$MKDIR" >> ${MKCONF_EXAMPLE}
 test -z "$TEST" || echo "TOOLS_PLATFORM.test?=		$TEST" >> ${MKCONF_EXAMPLE}
 test -z "$TOUCH" || echo "TOOLS_PLATFORM.touch?=		$TOUCH" >> ${MKCONF_EXAMPLE}
 test -z "$XARGS" || echo "TOOLS_PLATFORM.xargs?=		$XARGS" >> ${MKCONF_EXAMPLE}
-test -z "$CFLAGS" || ( echo "CFLAGS+=		$CFLAGS" >> ${MKCONF_EXAMPLE}; echo "DBG=" >> ${MKCONF_EXAMPLE} ) # prevent DBG from adding default optimizer flags		
+test -z "$CFLAGS" || (
+	echo "CFLAGS+=		$CFLAGS" >> ${MKCONF_EXAMPLE}
+	echo "DBG=			# prevent DBG from adding default optimizer flags" >> ${MKCONF_EXAMPLE}
+)
 test -z "$CPPFLAGS" || echo "CPPFLAGS+=		$CPPFLAGS" >> ${MKCONF_EXAMPLE}
 test -z "$LDFLAGS" || echo "LDFLAGS+=		$LDFLAGS" >> ${MKCONF_EXAMPLE}