From c317f0bc86c182a14641fdbfbd11fb72e8f3730c Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Fri, 8 Mar 2024 02:28:11 -0800 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ gnulib-tool | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de0cd2ad63..042fd868eb 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-08 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 47. diff --git a/gnulib-tool b/gnulib-tool index 9eb8c4ab87..0cf5e54a20 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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, -- 2.39.5