[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-618-g4337813

[Stefano Lattarini]

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=4337813be1c35f0d821283aae2ccb3d67c2ff1df

The branch, maint has been updated
       via  4337813be1c35f0d821283aae2ccb3d67c2ff1df (commit)
      from  280407599a72f8229c7b89d64b703e2dbc94cc87 (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 4337813be1c35f0d821283aae2ccb3d67c2ff1df
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 3 13:56:17 2012 +0100

    tests: fix spurious failures in 'pr300*.test'
    
    This change fixes automake bug#10426.
    
    * tests/pr300-lib.test: Call configure with an explicit '--libdir'
    option, to avoid spurious failures due to users possibly overriding
    '${libdir}' in ther config.site files.
    * tests/pr300-ltlib.test: Likewise.
    
    Reported by Bruno Haible.

-----------------------------------------------------------------------

Summary of changes:
 tests/pr300-lib.test   |    9 +++++++--
 tests/pr300-ltlib.test |   11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index ee46b4b..8f96db1 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2010, 2012 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
@@ -47,7 +47,12 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
-./configure --prefix "`pwd`/inst"
+# We pass '--libdir' explicitly, to avoid spurious failures due to users
+# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+# as is the case with openSUSE 12.1).  See automake bug#10426.
+cwd=`pwd` || Exit 99
+./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
 
 $MAKE
 
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index c47f32e..06d3c32 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2012 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
@@ -49,7 +49,12 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
-./configure --prefix "`pwd`/inst"
+# We pass '--libdir' explicitly, to avoid spurious failures due to users
+# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+# as is the case with openSUSE 12.1).  See automake bug#10426.
+cwd=`pwd` || Exit 99
+./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
 
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout


hooks/post-receive
-- 
GNU Automake