diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-08-08 03:52:01 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-08-08 04:00:50 +0200 |
| commit | 6ccfbd6495f2849b1aeea84f73327f6ced0080a7 (patch) | |
| tree | 32ae90a692811831ff75891eeb984ccab59a7fd0 /gnulib-tool | |
| parent | dac3c7e86dfd3d87c5868229aac392d81711d504 (diff) | |
| download | gnulib-6ccfbd6495f2849b1aeea84f73327f6ced0080a7.tar.gz | |
gnulib-tool: Add support for Automake 1.16.4.
Reported by <shoober420@gmail.com> in
<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00000.html>.
* build-aux/test-driver-1.16.3.diff: Renamed from build-aux/test-driver.diff.
* build-aux/test-driver.diff: Update to match Automake 1.16.4.
* gnulib-tool (func_create_testdir, func_create_megatestdir): Try both
.diff files.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnulib-tool b/gnulib-tool index 63a875d4a2..9c4a6c17ed 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -6767,7 +6767,9 @@ func_create_testdir () fi (cd "$testdir" if test -f build-aux/test-driver; then - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff || func_exit 1 + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \ + || patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \ + || func_exit 1 fi ) || func_exit 1 } @@ -6871,7 +6873,9 @@ func_create_megatestdir () func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 rm -rf autom4te.cache if test -f build-aux/test-driver; then - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff || func_exit 1 + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \ + || patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \ + || func_exit 1 fi ) || func_exit 1 } |