From eafd9cd7bf13be7e99a30188b3675aa4047b9307 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 18 Dec 2021 14:10:19 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ gnulib-tool | 24 +++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b6cc15860..07fce5e48b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-12-18 Bruno Haible + + 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 getopt-posix: Fix build on AIX (regression 2021-12-15). diff --git a/gnulib-tool b/gnulib-tool index 0d2b7e6353..d15c795135 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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 -- 2.39.5