diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-12-18 14:10:19 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-12-18 14:10:19 +0100 |
| commit | eafd9cd7bf13be7e99a30188b3675aa4047b9307 (patch) | |
| tree | 65581e71190907184d46be32bccba15ec3fb7790 /gnulib-tool | |
| parent | f223a0bdeb73b0c6bf94ac004330b7b4f8943dbd (diff) | |
| download | gnulib-eafd9cd7bf13be7e99a30188b3675aa4047b9307.tar.gz | |
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.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 24 |
1 files changed, 19 insertions, 5 deletions
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 |