inline-source: DO NOT EDIT warning only for top-level file.

* gl/build-aux/inline-source (func_include): When recursing, pass
through the value of `magic` so that only the very first #! magic
number has a DO NOT EDIT warning injected.
* bootstrap: Regenerate.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/bootstrap b/bootstrap
index e102622a2ad59aa6726d1bf5d77183172e5f66f3..86ff9f755bd3acac647750595f0a14715d824235 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1533,8 +1533,6 @@ func_lt_ver ()
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
-## DO NOT EDIT - This file generated from build-aux/options-parser
-##               by inline-source v2014-01-03.01
 
 # Set a version string for this script.
 scriptversion=2014-01-03.01; # UTC
@@ -2143,8 +2141,6 @@ func_version ()
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
-## DO NOT EDIT - This file generated from build-aux/extract-trace
-##               by inline-source v2014-01-03.01
 
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010

diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 1e4772c7fccc5296368007bcee8bd655e4f6b854..fede037c6c5406c6d43f335e07111982f9ef4bd8 100755 (executable)
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -124,7 +124,7 @@ func_include ()
     test -n "$_G_scriptdir" || _G_scriptdir="./"
 
     $AWK '
-        BEGIN { magic = 0; }
+        BEGIN { magic = '${_RECURSE_MAGIC-0}'; }
 
         /^#!/ && magic == 0 {
             print $0;
@@ -136,14 +136,14 @@ func_include ()
 
         /^\. ['\''"].*['\''"]$/ {
             file = substr ($2, 2, length ($2) -2);
-           system (sprintf ("'$progpath' %s", file));
+           system (sprintf ("env _RECURSE_MAGIC=%d '$progpath' %s", magic, file));
             next;
         }
 
         /^\. `echo [^`]*`['\''"][^'\''"]*['\''"]$/ {
             tail = substr ($0, match ($0, /`['\''"]/));
            file = substr (tail, 3, length (tail) -3);
-           system (sprintf ("'$progpath' '"$_G_scriptdir"'%s", file));
+           system (sprintf ("env _RECURSE_MAGIC=%d '$progpath' '"$_G_scriptdir"'%s", magic, file));
             next;
         }