From: Collin Funk Date: Fri, 8 Mar 2024 10:28:11 +0000 (-0800) Subject: gnulib-tool: Don't remove comments referencing @NMD@. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c3209e367ac39faf2f4e32d366a4e500d1b7660a;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index e9f7ad7235..e13cac8b11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-08 Collin Funk + + 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 c-strtod, c-strtold: Make multithread-safe. diff --git a/gnulib-tool b/gnulib-tool index b909a81f7a..22635ed7ab 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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,