maint: avoid empty lines in recipes

AIX 7.2 ‘make’ complains about recipe lines that are empty after
macro expansion, and I suppose there’s a good chance some
non-POSIX ‘make’ would prohibit them.  Rework macros so
that we can avoid them.
* gnulib-tool (func_emit_lib_Makefile_am)
(func_emit_lib_Makefile_am): Support @!NMD@ too.
* modules/gen-header (@gl_V_at): New macro.
* modules/alloca-opt, modules/argz, modules/assert-h:
* modules/byteswap, modules/configmake, modules/ctype:
* modules/dirent, modules/errno, modules/execinfo, modules/fcntl-h:
* modules/float, modules/fnmatch-h, modules/getopt-posix:
* modules/glob-h, modules/iconv-h, modules/ieee754-h:
* modules/inttypes-incomplete, modules/langinfo:
* modules/libtextstyle-optional, modules/limits-h, modules/locale:
* modules/malloc-h, modules/math, modules/monetary, modules/netdb:
* modules/openmp-init, modules/poll-h, modules/posix-shell:
* modules/pthread-h, modules/pty, modules/sched, modules/search:
* modules/signal-h, modules/sigsegv, modules/snippet/link-warning:
* modules/spawn, modules/stdalign, modules/stdarg, modules/stdbool:
* modules/stddef, modules/stdint, modules/stdio, modules/stdlib:
* modules/stdnoreturn, modules/string, modules/strings:
* modules/sysexits, modules/termios, modules/threads-h:
* modules/time, modules/uchar, modules/unicase/base:
* modules/uniconv/base, modules/unictype/base, modules/unigbrk/base:
* modules/unilbrk/base, modules/uniname/base, modules/uninorm/base:
* modules/unistd, modules/unistdio/base, modules/unistr/base:
* modules/unitypes, modules/uniwbrk/base, modules/uniwidth/base:
* modules/utime-h, modules/wchar, modules/wctype-h:
Use it.

1 files changed, 3 insertions, 3 deletions

diff --git a/gnulib-tool b/gnulib-tool
index 2870c2984a..0d4f246d8c 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3729,9 +3729,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@//'
+    sed_eliminate_NMD='s/@NMD@//;/@!NMD@/d'
   else
-    sed_eliminate_NMD='/@NMD@/d'
+    sed_eliminate_NMD='/@NMD@/d;s/@!NMD@//'
   fi
   if $for_test; then
     # When creating a package for testing: Attempt to provoke failures,
@@ -4109,7 +4109,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'
+  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