From: Ralf Wildenhues Date: Sun, 19 Apr 2009 15:39:03 +0000 (+0200) Subject: Avoid nonportable `./FILE' instead of `FILE' in test. X-Git-Tag: v1.11~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc5b07921ca692603ee95f58479e945b3ffd3db;p=thirdparty%2Fautomake.git Avoid nonportable `./FILE' instead of `FILE' in test. * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la' in *_LDADD entry if `$(top_builddir)' is `.'. Fixes test failure with parallel NetBSD make. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index c715a7035..0e7f941c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-04-19 Ralf Wildenhues + Avoid nonportable `./FILE' instead of `FILE' in test. + * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la' + in *_LDADD entry if `$(top_builddir)' is `.'. Fixes test failure + with parallel NetBSD make. + Detect make `include' style also with parallel non-GNU make. Parallel NetBSD make outputs `--- $target ---' messages, parallel HP-UX make outputs `Making target"$target"'. Just diff --git a/tests/libtool3.test b/tests/libtool3.test index 674a18cf1..c89f0764a 100755 --- a/tests/libtool3.test +++ b/tests/libtool3.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002, 2004 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ liba_liba_la_SOURCES = liba/a.c bin_PROGRAMS = 1 1_SOURCES = sub/1.c -1_LDADD = lib0.la $(top_builddir)/liba/liba.la +1_LDADD = lib0.la liba/liba.la END mkdir liba sub