[pkgsrc/trunk]: pkgsrc/mk Fixed "make debug" when CONFIGURE_ARGS contains a s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/757009db1727
branches:  trunk
changeset: 525538:757009db1727
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Feb 19 12:19:49 2007 +0000

description:
Fixed "make debug" when CONFIGURE_ARGS contains a shell redirection for
stdin.

diffstat:

 mk/bsd.pkg.debug.mk |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r f447ae19a35f -r 757009db1727 mk/bsd.pkg.debug.mk
--- a/mk/bsd.pkg.debug.mk       Mon Feb 19 12:10:43 2007 +0000
+++ b/mk/bsd.pkg.debug.mk       Mon Feb 19 12:19:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.debug.mk,v 1.15 2007/02/07 23:10:23 rillig Exp $
+# $NetBSD: bsd.pkg.debug.mk,v 1.16 2007/02/19 12:19:49 rillig Exp $
 #
 # Public targets:
 #
@@ -16,6 +16,15 @@
 
 PRINTF?=       printf
 
+# Note: In the many cases where ${x} is used, the quoting is left out
+# intentionally, since x is an element of a list of shell words, and
+# passing such a shell word to the shell should still result in one
+# word. That way, no extra level of quoting is introduced.
+#
+# The only exception is the "<" character in CONFIGURE_ARGS, where it
+# is often used to redirect the input coming from another source. That
+# character has to be quoted.
+
 .PHONY: \
        debug \
        _show-dbginfo-file-versions \
@@ -43,7 +52,10 @@
        sedexpr='s,.*\([$$]NetBSD:[^$$]*\$$\).*,\1,p';                  \
        ${FIND} * -type f -print                                        \
        | while read fname; do                                          \
-         ident=`${SED} -n "$${sedexpr}" "$${fname}"` || continue;      \
+         ident=`${SED} -n                                              \
+           -e 's,.*\\([$$]NetBSD:[^$$]*\\$$\\).*,\\1,p'                \
+           -e 's,.*\\([$$]Id:[^$$]*\\$$\\).*,\\1,p'                    \
+           "$${fname}"` || continue;                                   \
          case $${ident} in                                             \
          *?*) ${PRINTF} "\\t%s: %s\\n" "$${fname}" "$${ident}";;       \
          esac;                                                         \
@@ -62,7 +74,7 @@
        @${PRINTF} "\\n"
        @${PRINTF} "CONFIGURE_SCRIPT:\\n\\t%s\\n" ${CONFIGURE_SCRIPT}
        @${PRINTF} "\\n"
-       @${PRINTF} "CONFIGURE_ARGS:\\n"; ${CONFIGURE_ARGS:@x@${PRINTF} "\\t%s\\n" ${x};@}
+       @${PRINTF} "CONFIGURE_ARGS:\\n"; ${CONFIGURE_ARGS:@x@${PRINTF} "\\t%s\\n" ${x:S,<,\<,};@}
        @${PRINTF} "\\n"
 
 _show-dbginfo-config.status: