]> Savannah Git Hosting - gnulib.git/commitdiff
Fix support for --gnu-make in tests (regression 2021-12-15).
authorBruno Haible <bruno@clisp.org>
Sat, 18 Dec 2021 13:10:19 +0000 (14:10 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 18 Dec 2021 13:10:19 +0000 (14:10 +0100)
* gnulib-tool (func_emit_tests_Makefile_am): When producing output for
GNU make, eliminate %reldir% tokens.

ChangeLog
gnulib-tool

index 1b6cc1586046b1b1156469d2d51dcf0b6bfc9dc8..07fce5e48bc36f2d31b6651fc71fcaead7edc77f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-12-18  Bruno Haible  <bruno@clisp.org>
+
+       Fix support for --gnu-make in tests (regression 2021-12-15).
+       * gnulib-tool (func_emit_tests_Makefile_am): When producing output for
+       GNU make, eliminate %reldir% tokens.
+
 2021-12-17  Bruno Haible  <bruno@clisp.org>
 
        getopt-posix: Fix build on AIX (regression 2021-12-15).
index 0d2b7e6353f0dcd86c1bac62076be6630d9b5111..d15c795135a30a97c1af9bb29662945d8292d37e 100755 (executable)
@@ -4156,9 +4156,9 @@ func_emit_tests_Makefile_am ()
           { echo "## begin gnulib module $module"
             if $gnu_make; then
               echo "ifeq (,\$(OMIT_GNULIB_MODULE_$module))"
-              convert_to_gnu_make='s/^if \(.*\)/ifneq (,$(\1))/'
-            else
-              convert_to_gnu_make=
+              convert_to_gnu_make_1='s/^if \(.*\)/ifneq (,$(\1))/'
+              convert_to_gnu_make_2='s|%reldir%/||g'
+              convert_to_gnu_make_3='s|%reldir%|.|g'
             fi
             echo
             if test "$cond_dependencies" = true; then
@@ -4171,13 +4171,27 @@ func_emit_tests_Makefile_am ()
                 fi
               fi
             fi
-            sed "$convert_to_gnu_make" "$tmp"/amsnippet1
+            if $gnu_make; then
+              sed -e "$convert_to_gnu_make_1" \
+                  -e "$convert_to_gnu_make_2" \
+                  -e "$convert_to_gnu_make_3" \
+                  "$tmp"/amsnippet1
+            else
+              cat "$tmp"/amsnippet1
+            fi
             if test "$cond_dependencies" = true; then
               if func_cond_module_p "$module"; then
                 echo "endif"
               fi
             fi
-            sed "$convert_to_gnu_make" "$tmp"/amsnippet2
+            if $gnu_make; then
+              sed -e "$convert_to_gnu_make_1" \
+                  -e "$convert_to_gnu_make_2" \
+                  -e "$convert_to_gnu_make_3" \
+                  "$tmp"/amsnippet2
+            else
+              cat "$tmp"/amsnippet2
+            fi
             if $gnu_make; then
               echo "endif"
             fi