From d50f5538ddaca6a266c79166b956d40be5c2aa6c Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sun, 10 Mar 2024 01:02:30 -0800 Subject: [PATCH 5/5] 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. --- ChangeLog | 6 ++++++ gnulib-tool | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f565d0d657..9880ab1703 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 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 54. 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 -- 2.44.0