From: Collin Funk Date: Sun, 10 Mar 2024 09:02:30 +0000 (-0800) Subject: gnulib-tool: Don't remove comments referencing @NMD@, part 2. X-Git-Tag: v1.0~305 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3a1eb894fc318adfe0dcc3b3cd99438d31b1b9ca;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 5e1f44993d..1832598970 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-10 Collin Funk + + 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 gnulib-tool.py: One more comment regarding coding style. diff --git a/gnulib-tool b/gnulib-tool index 0cf5e54a20..47ee378444 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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