+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).
{ 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
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