]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Don't remove comments referencing @NMD@, part 2.
authorCollin Funk <collin.funk1@gmail.com>
Sun, 10 Mar 2024 09:02:30 +0000 (01:02 -0800)
committerBruno Haible <bruno@clisp.org>
Sun, 10 Mar 2024 13:16:35 +0000 (14:16 +0100)
* gnulib-tool (func_emit_tests_Makefile_am): Replace lines that start
with @NMD@ or @!NMD@ instead of lines that contain them.

ChangeLog
gnulib-tool

index 5e1f44993deae0dcaec5dff641395daf3f1a626a..1832598970b529633dd6d6a798f5bdbbc0c9edab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-10  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool: Don't remove comments referencing @NMD@, part 2.
+       * gnulib-tool (func_emit_tests_Makefile_am): Replace lines that start
+       with @NMD@ or @!NMD@ instead of lines that contain them.
+
 2024-03-10  Bruno Haible  <bruno@clisp.org>
 
        gnulib-tool.py: One more comment regarding coding style.
index 0cf5e54a2077630cef16c9cb63b701ff9b921d64..47ee378444e48b022f8504c070b4b4a457b9b2c8 100755 (executable)
@@ -4164,7 +4164,7 @@ func_emit_tests_Makefile_am ()
   fi
   # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations.
   # The logic is similar to how we define gl_source_base_prefix.
-  sed_eliminate_NMD='/@NMD@/d;s/@!NMD@//'
+  sed_eliminate_NMD='/^@NMD@/d;s/^@!NMD@//'
   if $for_test; then
     # When creating a package for testing: Attempt to provoke failures,
     # especially link errors, already during "make" rather than during