]> 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>
Fri, 8 Mar 2024 11:55:49 +0000 (12:55 +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 de0cd2ad639ac2ba202bed1468d3524eb6e55a91..042fd868ebaf2536bba593dd5893ae3536b08654 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-08  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Follow gnulib-tool changes, part 47.
index 9eb8c4ab87cf5c09cced4ef33b7fdeb65fa073ae..0cf5e54a2077630cef16c9cb63b701ff9b921d64 100755 (executable)
@@ -3773,9 +3773,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,