]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Don't remove comments referencing @NMD@.
authorCollin Funk <collin.funk1@gmail.com>
Fri, 8 Mar 2024 10:28:11 +0000 (02:28 -0800)
committerBruno Haible <bruno@clisp.org>
Sat, 16 Mar 2024 10:31:09 +0000 (11:31 +0100)
* gnulib-tool (func_emit_lib_Makefile_am): Replace lines that start with
@NMD@ or @!NMD@ instead of lines that contain them.

ChangeLog
gnulib-tool

index e9f7ad723585ff506b3649a1df90e10d98c14f4f..e13cac8b11193ce30c36c138da2db8c9143262b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-08  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool: Don't remove comments referencing @NMD@.
+       * gnulib-tool (func_emit_lib_Makefile_am): Replace lines that start with
+       @NMD@ or @!NMD@ instead of lines that contain them.
+
 2024-03-05  Bruno Haible  <bruno@clisp.org>
 
        c-strtod, c-strtold: Make multithread-safe.
index b909a81f7a1c270e0362286f2deb0088155826e2..22635ed7abd9b79aa1f28f025085fa2a240ead62 100755 (executable)
@@ -3751,9 +3751,9 @@ func_emit_lib_Makefile_am ()
   # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations.
   # The logic is similar to how we define gl_source_base_prefix.
   if $automake_subdir; then
-    sed_eliminate_NMD='s/@NMD@//;/@!NMD@/d'
+    sed_eliminate_NMD='s/^@NMD@//;/^@!NMD@/d'
   else
-    sed_eliminate_NMD='/@NMD@/d;s/@!NMD@//'
+    sed_eliminate_NMD='/^@NMD@/d;s/^@!NMD@//'
   fi
   if $for_test; then
     # When creating a package for testing: Attempt to provoke failures,