[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-282-g08aa275 |
|
Date: |
Sun, 02 Jan 2011 04:49:22 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=08aa27513aae0e07f0ce8a01694b70a67ed4e946
The branch, branch-1.11 has been updated
via 08aa27513aae0e07f0ce8a01694b70a67ed4e946 (commit)
via 60030d61dafa00b7792cb96eaee10f786182752d (commit)
via 511ccb162321d30f3187997b94e47ac424cd9baf (commit)
via 20fb9cebd5ca7c48c0eeba32d6ea42bab1f5b912 (commit)
via 9552ab180a2ecbccd8a2439ad860838a497315aa (commit)
via d7430fea6a8b878b1bfdf89af561a93f2746576d (commit)
via 49860170d3eea01cca9a76f6e738ca345a09e306 (commit)
via 2f8861f47415fc98ee381cb13824176ed5932726 (commit)
via ab323bcc12b86490a45f9fd6fbbc12d3cc1ea38d (commit)
via f6ab59edd56044980c06fb3c57a3c96dd4e6cfbb (commit)
via 4b285ef86883d30d9fe74a2d33366ee2398bc86e (commit)
via 3a5f8cc69e6687d2f074522cf9d69be4eea6d8f8 (commit)
via 4abf2246375e96b8a82affdf04f079e3e9ee7c73 (commit)
via fdb2764f70ff5f3aed51a61baf3b72511ffb9d11 (commit)
from ff84a70462ab1a800b16d09bc56ffe14299daedb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 08aa27513aae0e07f0ce8a01694b70a67ed4e946
Merge: ff84a70 60030d6
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jan 2 05:37:23 2011 +0100
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 105 ++++++++++++++++++++++++++++++++-
Makefile.in | 2 +-
NEWS | 18 ++++++
aclocal.in | 8 ++-
aclocal.m4 | 3 +-
automake.in | 32 +++++++----
doc/Makefile.in | 2 +-
doc/automake.texi | 15 +++--
lib/Automake/Makefile.in | 2 +-
lib/Automake/tests/Makefile.in | 2 +-
lib/Makefile.in | 2 +-
lib/am/Makefile.in | 2 +-
m4/Makefile.in | 2 +-
tests/Makefile.am | 5 ++
tests/Makefile.in | 7 ++-
tests/depcomp8a.test | 79 +++++++++++++++++++++++++
tests/depcomp8b.test | 73 +++++++++++++++++++++++
tests/distlinksbrk.test | 31 ++++------
tests/help-depend.test | 6 +-
tests/help-depend2.test | 6 +-
tests/help-dmalloc.test | 2 +-
tests/help-init.test | 6 +-
tests/help-lispdir.test | 8 ++-
tests/help-maintainer.test | 9 ++-
tests/help-multilib.test | 2 +-
tests/help-silent.test | 6 +-
tests/help-upc.test | 4 +-
tests/parallel-tests8.test | 5 +-
tests/subdir5.test | 3 +-
tests/subobj11a.test | 82 +++++++++++++++++++++++++
tests/subobj11b.test | 87 +++++++++++++++++++++++++++
tests/{strip2.test => subobj11c.test} | 39 ++++++------
tests/subobj9.test | 3 +
tests/suffix13.test | 3 +-
34 files changed, 567 insertions(+), 94 deletions(-)
create mode 100755 tests/depcomp8a.test
create mode 100755 tests/depcomp8b.test
create mode 100755 tests/subobj11a.test
create mode 100755 tests/subobj11b.test
copy tests/{strip2.test => subobj11c.test} (51%)
diff --git a/ChangeLog b/ChangeLog
index 5964d26..a0d406d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,106 @@
+2011-01-02 Ralf Wildenhues <address@hidden>
+
+ Fix maintainer-check regression.
+ * tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
+ environment.
+
+ Bump copyright years.
+ * aclocal.in (write_aclocal, version): Bump copyright years.
+ * automake.in (gen_copyright, version): Likewise.
+ * doc/automake.texi: Likewise.
+
+2010-12-23 Ralf Wildenhues <address@hidden>
+ Stefano Lattarini <address@hidden>
+
+ Work around a bug in file-inclusion mechanism of Solaris make.
+ * automake.in (handle_single_transform): In the name of the
+ dependency file: collapse multiple slash characters into a single
+ one.
+ * tests/subobj11a.test: New test.
+ * tests/subobj11b.test: Likewise.
+ * tests/subobj11c.test: Likewise.
+ * tests/depcomp8a.test: Likewise.
+ * tests/depcomp8b.test: Likewise.
+ * tests/Makefile.am (TESTS): Updated.
+ * NEWS: Updated.
+ Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
+ patch and tests by Stefano Lattarini.
+
+2010-12-22 Stefano Lattarini <address@hidden>
+
+ Fix two spurious testsuite failures on IRIX 6.5.
+ * tests/suffix13.test (Makefile.am): Account for VPATH issues on
+ weaker make implementations (e.g. IRIX 6.5).
+ * tests/parallel-tests8.test: Likewise, plus a required related
+ change.
+ Reported by Ralf Wildenhues. The bugs have been there from the
+ first versions of the affected test scripts.
+
+2010-12-22 Stefano Lattarini <address@hidden>
+
+ docs: cygnus mode doesn't require AM_CYGWIN32 macro.
+ * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
+ the AM_CYGWIN32 macro (and indeed hasn't required it since at
+ least commit Release-1-2-31-g3038064 "merged changes from
+ Cygnus" of 1997-08-25).
+
+2010-12-22 Stefano Lattarini <address@hidden>
+
+ distlinksbrk.test: Work around botched "make -k".
+ * tests/distlinksbrk.test: Run "make" multiple times and grep
+ its output each time for a single error message, rather than
+ running "make -k" one single time and grepping its output for
+ all the expected error messages. This should work around make
+ implementations with limited (broken?) `-k' support; for more
+ information, see these subthreads on the automake-patches list:
+ - 2010-11-15, "Testsuite failures on HP-UX 11.23",
+
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
+ - 2010-11-15, "Testsuite failures on IRIX 6.5",
+
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
+
+2010-12-21 Stefano Lattarini <address@hidden>
+
+ Fix sed-related buglet in test "subdir5.test"
+ * tests/subdir5.test: Always terminate text passed to the
+ `i' sed command with a newline, to work around limitations
+ in e.g. older OpenBSD sed.
+
+2010-12-18 Stefano Lattarini <address@hidden>
+
+ docs: fix blunder in example about python extension modules
+ * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
+ not `quaternion_SOURCES', to declare the sources of python
+ extension module `quaternion.la'.
+
+2010-12-16 Stefano Lattarini <address@hidden>
+
+ docs: list LTLIBRARIES among Automake primaries
+ * doc/automake.texi (Uniform): List `LTLIBRARIES' among
+ the Automake primaries.
+
+2010-12-14 Stefano Lattarini <address@hidden>
+
+ Improve tests on generated portions of configure help screen.
+ * tests/help-depend.test: Grepping of configure help screen
+ relaxed to cater for possible line wrapping, and tightened in
+ other respects.
+ * tests/help-depend2.test: Likewise.
+ * tests/help-dmalloc.test: Likewise.
+ * tests/help-lispdir.test: Likewise.
+ * tests/help-maintainer.test: Likewise.
+ * tests/help-multilib.test: Likewise.
+ * tests/help-silent.test: Likewise.
+ * tests/help-upc.test: Likewise.
+ * tests/help-init.test: Grepping of configure help screen
+ tightened.
+
+2010-12-10 Ralf Wildenhues <address@hidden>
+
+ Avoid running installed automake from 'libtool --help'.
+ * tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
+ Together with fixed Libtool, this fixes check-coverage to not
+ invoke installed automake.
+
2010-11-25 Stefano Lattarini <address@hidden>
Fix spurious failures in `silent*.test' for $CC != gcc
@@ -134,7 +237,7 @@
Fix regression in ansi.test (failure on AIX 5.3).
* tests/ansi.test: Remove redundant hackish check done using a
- hand-postprocessed Makefile.in. This checks worked by setting
+ hand-postprocessed Makefile.in. This check worked by setting
the `$(SHELL)' macro on the command line of make, but this is
not supported by the AIX 5.3 make implementation.
This bug has been lurking for a long time, and was activated by
diff --git a/Makefile.in b/Makefile.in
index 06eb46f..29450c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/NEWS b/NEWS
index fcb0898..4d4e202 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,24 @@ Bugs fixed in 1.11.1a:
- Rules generated by Automake now try harder to not change any files when
`make -n' is invoked. Fixes include compilation of Emacs Lisp, Vala, or
Yacc source files and the rule to update config.h.
+
+ - Several scripts as well as the parallel-tests testsuite driver now
+ exit with the right exit status upon receiving a signal.
+
+ - A per-Makefile.am setting of -Werror does not carry over to the
+ handling of other Makefile.am files any more.
+
+ - The order of Yacc and Lex flags is fixed to be consistent with other
+ languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
+ $(LFLAGS), so that the user variables override the developer variables.
+
+ - Rules generated by Automake now try harder to not change any files when
+ `make -n' is invoked. Fixes include compilation of Emacs Lisp, Vala, or
+ Yacc source files and the rule to update config.h.
+
+ - The code for automatic dependency tracking works around a Solaris
+ make bug triggered by sources containing repeated slashes when the
+ `subdir-objects' was used.
Bugs fixed in 1.11.1:
diff --git a/aclocal.in b/aclocal.in
index b5c2c41..2210fe3 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -8,7 +8,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# aclocal - create aclocal.m4 by scanning configure.ac
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
@@ -818,7 +819,8 @@ $output";
$output = "# generated automatically by aclocal $VERSION -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -910,7 +912,7 @@ sub version()
{
print <<EOF;
aclocal (GNU $PACKAGE) $VERSION
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/aclocal.m4 b/aclocal.m4
index 3e43689..db46df5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
# generated automatically by aclocal 1.11.1a -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/automake.in b/automake.in
index 8f3edde..fa110a5 100755
--- a/automake.in
+++ b/automake.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# automake - create Makefile.in from Makefile.am
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -258,7 +258,7 @@ my %standard_prefix =
# Copyright on generated Makefile.ins.
my $gen_copyright = "\
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2108,14 +2108,24 @@ sub handle_single_transform ($$$$$%)
# Transform .o or $o file into .P file (for automatic
# dependency code).
- if ($lang && $lang->autodep ne 'no')
- {
- my $depfile = $object;
- $depfile =~ s/\.([^.]*)$/.P$1/;
- $depfile =~ s/\$\(OBJEXT\)$/o/;
- $dep_files{dirname ($depfile) . '/$(DEPDIR)/'
- . basename ($depfile)} = 1;
- }
+ # Properly flatten multiple adjacent slashes, as Solaris 10 make
+ # might fail over them in an include statement.
+ # Leading double slashes may be special, as per Posix, so deal
+ # with them carefully.
+ if ($lang && $lang->autodep ne 'no')
+ {
+ my $depfile = $object;
+ $depfile =~ s/\.([^.]*)$/.P$1/;
+ $depfile =~ s/\$\(OBJEXT\)$/o/;
+ my $maybe_extra_leading_slash = '';
+ $maybe_extra_leading_slash = '/' if $depfile =~ m,^//[^/],;
+ $depfile =~ s,/+,/,g;
+ my $basename = basename ($depfile);
+ # This might make $dirname empty, but we account for that below.
+ (my $dirname = dirname ($depfile)) =~ s/\/*$//;
+ $dirname = $maybe_extra_leading_slash . $dirname;
+ $dep_files{$dirname . '/$(DEPDIR)/' . $basename} = 1;
+ }
}
return @result;
@@ -8394,7 +8404,7 @@ sub version ()
{
print <<EOF;
automake (GNU $PACKAGE) $VERSION
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6a92f15..18e0e87 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/doc/automake.texi b/doc/automake.texi
index 3f7003e..01e2b1b 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -24,8 +24,8 @@ This manual is for GNU Automake (version @value{VERSION},
Makefiles from template files.
Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -2024,10 +2024,12 @@ should not be built until the @samp{make check} command
is run. Those
objects are not installed either.
The current primary names are @samp{PROGRAMS}, @samp{LIBRARIES},
address@hidden, @samp{PYTHON}, @samp{JAVA}, @samp{SCRIPTS}, @samp{DATA},
address@hidden, @samp{MANS}, and @samp{TEXINFOS}.
address@hidden, @samp{LISP}, @samp{PYTHON}, @samp{JAVA},
address@hidden, @samp{DATA}, @samp{HEADERS}, @samp{MANS}, and
address@hidden
@vindex PROGRAMS
@vindex LIBRARIES
address@hidden LTLIBRARIES
@vindex LISP
@vindex PYTHON
@vindex JAVA
@@ -7630,7 +7632,7 @@ as follows to Automake:
@example
pyexec_LTLIBRARIES = quaternion.la
-quaternion_SOURCES = quaternion.c support.c support.h
+quaternion_la_SOURCES = quaternion.c support.c support.h
quaternion_la_LDFLAGS = -avoid-version -module
@end example
@@ -9805,8 +9807,7 @@ The options @option{no-installinfo} and
@option{no-dependencies} are
implied.
@item
-The macros @code{AM_MAINTAINER_MODE} and @code{AM_CYGWIN32} are
-required.
+The macro @code{AM_MAINTAINER_MODE} is required.
@item
The @code{check} target doesn't depend on @code{all}.
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 82b8025..5d73a3c 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 4ecbd86..8fcfd75 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/lib/Makefile.in b/lib/Makefile.in
index f4a43c0..04b5d0e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 30827c9..b3f5741 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 21a9d7a..845ad1f 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dab04e3..8842be3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -262,6 +262,8 @@ depcomp4.test \
depcomp5.test \
depcomp6.test \
depcomp7.test \
+depcomp8a.test \
+depcomp8b.test \
depdist.test \
depend.test \
depend2.test \
@@ -692,6 +694,9 @@ subobj7.test \
subobj8.test \
subobj9.test \
subobj10.test \
+subobj11a.test \
+subobj11b.test \
+subobj11c.test \
subobjname.test \
subpkg.test \
subpkg2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c6f76e4..d491e3b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -529,6 +529,8 @@ depcomp4.test \
depcomp5.test \
depcomp6.test \
depcomp7.test \
+depcomp8a.test \
+depcomp8b.test \
depdist.test \
depend.test \
depend2.test \
@@ -959,6 +961,9 @@ subobj7.test \
subobj8.test \
subobj9.test \
subobj10.test \
+subobj11a.test \
+subobj11b.test \
+subobj11c.test \
subobjname.test \
subpkg.test \
subpkg2.test \
diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test
new file mode 100755
index 0000000..b4a0e3a
--- /dev/null
+++ b/tests/depcomp8a.test
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test for regressions in computation of names of .Po files for
+# automatic dependency tracking.
+# Keep this in sync with sister test `depcomp8b.test', which checks the
+# same thing for libtool objects.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = foo.c sub/bar.c
+END
+
+mkdir sub
+cat > foo.c << 'END'
+int main(void)
+{
+ extern int bar;
+ return bar;
+}
+END
+cat > sub/bar.c << 'END'
+extern int bar = 0;
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # for debugging
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
+grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+$MAKE
+./zardoz
+$MAKE distcheck
+
+# Try again with subdir-objects option.
+
+echo AM_PROG_CC_C_O >> configure.in
+echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # for debugging
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+$MAKE
+./zardoz
+$MAKE distcheck
+
+:
diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test
new file mode 100755
index 0000000..1ae7459
--- /dev/null
+++ b/tests/depcomp8b.test
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test for regressions in computation of names of .Plo files for
+# automatic dependency tracking.
+# Keep this in sync with sister test `depcomp8a.test', which checks the
+# same thing for non-libtool objects.
+
+required=libtoolize
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libzardoz.la
+libzardoz_la_SOURCES = foo.c sub/bar.c
+END
+
+mkdir sub
+echo 'extern int foo = 0;' > foo.c
+echo 'extern int bar = 0;' > sub/bar.c
+
+libtoolize
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # for debugging
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
+grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+$MAKE
+$MAKE distcheck
+
+# Try again with subdir-objects option.
+
+echo AM_PROG_CC_C_O >> configure.in
+echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # for debugging
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+$MAKE
+$MAKE distcheck
+
+:
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
index 1e478ab..2314408 100755
--- a/tests/distlinksbrk.test
+++ b/tests/distlinksbrk.test
@@ -49,30 +49,25 @@ test -h $lnk2
test -h $lnka
test -h $lnkb
-cat >>configure.in <<END
+cat >> configure.in <<'END'
AC_OUTPUT
END
-cat > Makefile.am <<END
-EXTRA_DIST = $lnk1 $lnk2 $lnka $lnkb
-END
-
-ls -l
-
$ACLOCAL
$AUTOCONF
-$AUTOMAKE
-./configure
-# Distribution must fail.
-$MAKE distdir && Exit 1
+ls -l # for debugging
-# Names of distributed broken symlinks should be reported in make output.
-$MAKE -k distdir >out 2>&1 || : # don't trust the exit status of make -k
-cat out
-$FGREP $lnk1 out
-$FGREP $lnk2 out
-$FGREP $lnka out
-$FGREP $lnkb out
+# Don't try to use "make -k", because some botched make implementations
+# (HP-UX, IRIX) might still exit on the first error in this situations.
+for lnk in $lnk1 $lnk2 $lnka $lnkb; do
+ echo "EXTRA_DIST = $lnk" > Makefile.am
+ $AUTOMAKE
+ ./configure
+ # Distribution must fail, with a decent error message.
+ $MAKE distdir >out 2>&1 && { cat out; Exit 1; }
+ cat out
+ $FGREP $lnk out
+done
:
diff --git a/tests/help-depend.test b/tests/help-depend.test
index ed9447e..e676e5e 100755
--- a/tests/help-depend.test
+++ b/tests/help-depend.test
@@ -33,9 +33,9 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --enable-dependency-tracking ' stdout
-$FGREP ' --disable-dependency-tracking ' stdout
-$FGREP ' one-time build' stdout
+$EGREP '^ *--enable-dependency-tracking( |$)' stdout
+$EGREP '^ *--disable-dependency-tracking( |$)' stdout
+$FGREP ' speeds up one-time build' stdout
$FGREP ' slow dependency extract' stdout
:
diff --git a/tests/help-depend2.test b/tests/help-depend2.test
index b4133b4..6bad661 100755
--- a/tests/help-depend2.test
+++ b/tests/help-depend2.test
@@ -34,9 +34,9 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --enable-dependency-tracking ' stdout
-$FGREP ' --disable-dependency-tracking ' stdout
-$FGREP ' one-time build' stdout
+$EGREP '^ *--enable-dependency-tracking( |$)' stdout
+$EGREP '^ *--disable-dependency-tracking( |$)' stdout
+$FGREP ' speeds up one-time build' stdout
$FGREP ' slow dependency extract' stdout
:
diff --git a/tests/help-dmalloc.test b/tests/help-dmalloc.test
index c20288d..51b3ba4 100755
--- a/tests/help-dmalloc.test
+++ b/tests/help-dmalloc.test
@@ -32,7 +32,7 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --with-dmalloc ' stdout
+$EGREP '^ *--with-dmalloc( |$) ' stdout
$FGREP ' use dmalloc' stdout
$FGREP 'www.dmalloc.com' stdout
diff --git a/tests/help-init.test b/tests/help-init.test
index a3af271..fdd9fa0 100755
--- a/tests/help-init.test
+++ b/tests/help-init.test
@@ -32,8 +32,8 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' --program-prefix[= ]' stdout
-grep ' --program-suffix[= ]' stdout
-grep ' --program-transform-name[= ]' stdout
+grep '^ *--program-prefix[= ]' stdout
+grep '^ *--program-suffix[= ]' stdout
+grep '^ *--program-transform-name[= ]' stdout
:
diff --git a/tests/help-lispdir.test b/tests/help-lispdir.test
index 3d82074..5eb7ab9 100755
--- a/tests/help-lispdir.test
+++ b/tests/help-lispdir.test
@@ -32,9 +32,11 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' --with-lispdir .*override.*lisp directory' stdout
-grep ' EMACS .*[eE]macs editor' stdout
-grep ' EMACSLOADPATH' stdout
+$EGREP '^ *--with-lispdir( |$)' stdout
+grep ' override.*lisp directory' stdout
+$EGREP '^ *EMACS( |$)' stdout
+grep ' .*[eE]macs editor' stdout
+$EGREP '^ *EMACSLOADPATH( |$)' stdout
grep ' .*[eE]macs library search path' stdout
:
diff --git a/tests/help-maintainer.test b/tests/help-maintainer.test
index 72fc98a..6933d0c 100755
--- a/tests/help-maintainer.test
+++ b/tests/help-maintainer.test
@@ -31,7 +31,8 @@ $ACLOCAL
$AUTOCONF --force
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' --enable-maintainer-mode.*enable make rules' stdout
+$EGREP '^ *--enable-maintainer-mode( |$)' stdout
+$FGREP ' enable make rules' stdout
rm -rf autom4te*.cache # just to be sure
sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in >t
@@ -42,7 +43,8 @@ $ACLOCAL
$AUTOCONF --force
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' --enable-maintainer-mode.*enable make rules' stdout
+$EGREP '^ *--enable-maintainer-mode( |$)' stdout
+$FGREP ' enable make rules' stdout
rm -rf autom4te*.cache # just to be sure
sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in >t
@@ -53,6 +55,7 @@ $ACLOCAL
$AUTOCONF --force
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' --disable-maintainer-mode.*disable make rules' stdout
+$EGREP '^ *--disable-maintainer-mode( |$)' stdout
+$FGREP ' disable make rules' stdout
:
diff --git a/tests/help-multilib.test b/tests/help-multilib.test
index 0016c76..1657c34 100755
--- a/tests/help-multilib.test
+++ b/tests/help-multilib.test
@@ -32,7 +32,7 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --enable-multilib ' stdout
+$EGREP '^ *--enable-multilib( |$)' stdout
$FGREP ' many library versions (default)' stdout
:
diff --git a/tests/help-silent.test b/tests/help-silent.test
index b338907..e59f2f1 100755
--- a/tests/help-silent.test
+++ b/tests/help-silent.test
@@ -36,8 +36,10 @@ for args in '' '([])' '([yes])' '([no])'; do
$AUTOCONF --force
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
- grep ' --enable-silent-rules *less verbose build.*undo.*make V=1' stdout
- grep ' --disable-silent-rules *verbose build.*undo.*make V=0' stdout
+ $EGREP '^ *--enable-silent-rules( |$)' stdout
+ grep ' less verbose build.*undo.*make V=1' stdout
+ $EGREP '^ *--disable-silent-rules ( |$)' stdout
+ grep ' verbose build.*undo.*make V=0' stdout
done
:
diff --git a/tests/help-upc.test b/tests/help-upc.test
index 586299b..8f5ff5f 100755
--- a/tests/help-upc.test
+++ b/tests/help-upc.test
@@ -32,7 +32,7 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-grep ' UPCFLAGS .*Unified Parallel C compiler flags' stdout
-grep ' UPC .*Unified Parallel C compiler command' stdout
+grep '^ *UPCFLAGS .*Unified Parallel C compiler flags' stdout
+grep '^ *UPC .*Unified Parallel C compiler command' stdout
:
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 784e07f..43e67df 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -38,7 +38,8 @@ TESTS = foo.test
## the next line will cause automake to error out:
TESTS += $(srcdir)/bar.test $(top_srcdir)/baz.test
.in.test:
- cp $< $@
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
+ cp `test -f $< || echo $(srcdir)/`$< $@
chmod +x $@
check_SCRIPTS = $(TESTS)
EXTRA_DIST = foo.in foo.test
@@ -57,7 +58,7 @@ AUTOMAKE_fails -a
grep '(srcdir.*bar' stderr
grep 'top_srcdir.*baz' stderr
-sed '/srcdir/d' < Makefile.am > t
+sed '/^TESTS +=.*srcdir/d' < Makefile.am > t
mv -f t Makefile.am
$AUTOMAKE -a
diff --git a/tests/subdir5.test b/tests/subdir5.test
index 6eb3aaa..5633ac6 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -69,7 +69,8 @@ $MAKE
sed <configure.in >configure.tmp -e '/^AC_OUTPUT$/i\
AC_CONFIG_FILES([maude/Makefile])\
-m4_include([confile.m4])'
+m4_include([confile.m4])\
+' # last newline required by older OpenBSD sed
mv -f configure.tmp configure.in
cat configure.in # might be useful for debugging
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
new file mode 100755
index 0000000..3bf3012
--- /dev/null
+++ b/tests/subobj11a.test
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake works around a bug of Solaris Make. The bug is the
+# following. If we have a Makefile containg a file inclusion like this:
+# include .//foo.mk
+# Solaris make fails with a message like:
+# make: ... can't find `/foo.mk': No such file or directory
+# make: fatal error ... read of include file `/foo.mk' failed
+# (even if the file `foo.mk' exists). The error disappear by collapsing
+# the repeated slash `/' characters into a single one.
+#
+# See also sister "grepping" test `subobj11b.test', and related test
+# `subobj11c.test'.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+## the `.//' is meant
+foo_SOURCES = .//src/foo.c
+END
+
+mkdir src
+
+cat > src/foo.c << 'END'
+int main(void)
+{
+ return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure --enable-dependency-tracking
+
+depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
+if test x"$depdir" != x; then
+ depdir=src/$depdir
+else
+ echo "$me: cannot extract value of DEPDIR from Makefile" >&2
+ Exit 1
+fi
+
+ls -l "$depdir"
+test -f "$depdir"/foo.Po
+
+echo 'quux:; echo "address@hidden@z" >$@' >> "$depdir"/foo.Po
+
+$MAKE quux
+$FGREP "address@hidden@z" quux
+
+$MAKE
+
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking' $MAKE distcheck
+
+:
diff --git a/tests/subobj11b.test b/tests/subobj11b.test
new file mode 100755
index 0000000..1db5fab
--- /dev/null
+++ b/tests/subobj11b.test
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake works around a bug of Solaris Make. The bug is the
+# following. If we have a Makefile containg a file inclusion like this:
+# include .//foo.mk
+# Solaris make fails with a message like:
+# make: ... can't find `/foo.mk': No such file or directory
+# make: fatal error ... read of include file `/foo.mk' failed
+# (even if the file `foo.mk' exists). The error disappear by collapsing
+# the repeated slash `/' characters into a single one.
+#
+# See also "semantic" sister test `subobj11a.test', and related test
+# `subobj11c.test'.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+## The `zardoz' sources should activate a code paths in Automake that
+## cannot be sensibly tested by sister test `subobj11a.test'. The other
+## sources provide some sort of stress testing.
+foo_SOURCES = \
+ //server/zardoz0.c \
+ //server//zardoz1.c \
+ //server/path/to/zardoz2.c \
+ //server/another//path///to////zardoz3.c \
+ /foobar0.c \
+ ///foobar1.c \
+ ////foobar2.c \
+ /sub///foobar3.c \
+ ///sub/foobar4.c \
+ .//foobar5.c \
+ .//sub/foobar6.c \
+ ./sub//foobar7.c \
+ .//sub//foobar8.c \
+ sub/sub//sub///sub////foobar9.c
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# Be lax in the regexp, to account for automake conditionals, the
+# use of @am__include@, and similar stuff.
+grep 'include.*//.*foobar' Makefile.in && Exit 1
+
+# These checks depend on automake internals, but presently this is
+# the only way to test the code path we are interested in.
+# Please update these checks when (and if) the relevant automake
+# internals are changed.
+for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do
+ case $x in
+ */*) d=`echo $x | sed 's,[^/]*$,,'`; b=`echo $x | sed 's,^.*/,,'`;;
+ *) d=''; b=$x;;
+ esac
+ # Be a little lax in the regexp, to account for automake conditionals,
+ # quoting, and similar stuff.
+ grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in
+done
+
+# Sanity checks.
+for i in 0 1 2 3 4 5 6 7 8 9; do
+ grep "am__include.*/foobar$i\\." Makefile.in
+done
+
+:
diff --git a/tests/strip2.test b/tests/subobj11c.test
similarity index 51%
copy from tests/strip2.test
copy to tests/subobj11c.test
index 5786ded..9262d15 100755
--- a/tests/strip2.test
+++ b/tests/subobj11c.test
@@ -14,41 +14,40 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Ensure install-strip works when STRIP consists of more than one word.
-# This test needs GNU binutils strip. See sister test strip3.
+# Automatic dependency tracking with subdir-objects option active:
+# check for a pathological case of slash-collapsing in the name of
+# included makefile fragments (containing dependency info).
+# See also related tests `subobj11a.test' and `subobj11b.test'
-required=strip
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
+AM_PROG_CC_C_O
END
cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = foo
-lib_LIBRARIES = libfoo.a
+foo_SOURCES = //zardoz.c
END
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-cat > libfoo.c << 'END'
-int foo () { return 0; }
-END
-
-
$ACLOCAL
-$AUTOCONF
$AUTOMAKE -a
-prefix=`pwd`/inst
-./configure --prefix="$prefix" STRIP='strip --verbose'
-$MAKE
-$MAKE install-strip
+#
+# This check depends on automake internals, but presently this is
+# the only way to test the code path we are interested in.
+# Please update these checks when (and if) the relevant automake
+# internals are changed.
+#
+# Be a little lax in the regexp, to account for automake conditionals,
+# quoting, and similar stuff.
+#
+# FIXME: Are we sure this is the most sensible output in our situation?
+#
+grep '^[^/]*am__include[^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
:
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 2045d58..83f3a31 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -64,6 +64,9 @@ $AUTOMAKE -a
# Skip this test on configure errors (e.g., broken C++ compilers).
./configure || Exit 77
+# Ensure './libtool --help' will use the right tool versions.
+export AUTOCONF AUTOMAKE
+
# Opportunistically check that --tag=CXX is used when supported.
if ./libtool --help | grep tag=TAG; then
$MAKE print >stdout || { cat stdout; Exit 1; }
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 2b39460..aa5a3ed 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -38,7 +38,8 @@ AUTOMAKE_OPTIONS = subdir-objects
SUFFIXES = .baz .c
.baz.c:
case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac
- cp $< $@
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
+ cp `test -f $< || echo $(srcdir)/`$< $@
DISTCLEANFILES = sub/bar.c
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-282-g08aa275,
Ralf Wildenhues <=