]> 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>
Sat, 16 Mar 2024 10:45:24 +0000 (11:45 +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 14e3f1e2f32959471263cbd54de1c37012340633..15e9b62bc98f3856f9960fd8ea8bd8e016696076 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-08  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool: Don't remove comments referencing @NMD@.
index eaeb06d79903f06fb04bcca5b4f21e64cf893f12..ed68ed237aa6e047c5f44c42fccd57456fde12b0 100755 (executable)
@@ -4142,7 +4142,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