]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
tests: fix spurious failure with Solaris make
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 8 Aug 2011 08:20:47 +0000 (10:20 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 8 Aug 2011 08:22:09 +0000 (10:22 +0200)
* tests/distcheck-configure-flags-am.test: Avoid using `+=' too
liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
so introduced, in conjunction with single quotes, might confuse
Solaris make.

ChangeLog
tests/distcheck-configure-flags-am.test

index 9fabd7d12ca8c13a43e70e1eec42cdffb740243b..5ee2a1684326219039e67bddc9b636b11bf0b8c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: fix spurious failure with Solaris make
+       * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
+       liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
+       so introduced, in conjunction with single quotes, might confuse
+       Solaris make.
+
 2011-06-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
index a5cab6a5015d67704e69d6eec7059b7a0233f8c0..dc31ee35c743c2fa5363679b4a09770d2d35d3f0 100755 (executable)
@@ -32,7 +32,9 @@ END
 unset sentence || :
 
 cat > Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-success sentence='it works :-)'
+AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
+dc_flags1 = --enable-success sentence='it works :-)'
+dc_flags2 =
 END
 
 $ACLOCAL
@@ -54,7 +56,7 @@ $MAKE distcheck
 # $(AM_DISTCHECK_CONFIGURE_FLAGS)
 
 cat >> Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS += --disable-success
+dc_flags2 += --disable-success
 END
 $AUTOMAKE Makefile
 ./config.status Makefile