[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1693-g5b13742

[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=5b13742fa9cb45dd7b616ec54d7cea59a07c0876

The branch, master has been updated
       via  5b13742fa9cb45dd7b616ec54d7cea59a07c0876 (commit)
       via  4e4dae500390d2ace681e4e4bc4c590ecdca38c6 (commit)
       via  971000c121b9b79b787435f1eaaa76caa37986ee (commit)
       via  f4e221b65d381243553f82e125c615eaaf8ed5de (commit)
       via  4337813be1c35f0d821283aae2ccb3d67c2ff1df (commit)
      from  b190798a1585327e4aa59ddf9af22f160b987c74 (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 5b13742fa9cb45dd7b616ec54d7cea59a07c0876
Merge: b190798 4e4dae5
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 3 23:26:56 2012 +0100

    Merge branch 'maint'
    
    * maint:
      install: pkglibexec_SCRIPTS is a valid prefix/primary combination
      coverage: expose automake bug#10128
      progs, libs: implement EXTRA_foo_DEPENDENCIES
      tests: fix spurious failures in 'pr300*.test'

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

Summary of changes:
 NEWS                                        |    5 +++
 THANKS                                      |    1 +
 automake.in                                 |    6 ++--
 doc/automake.texi                           |    5 ++-
 lib/am/library.am                           |    4 +-
 lib/am/ltlibrary.am                         |    4 +-
 lib/am/program.am                           |    4 +-
 tests/Makefile.am                           |    4 ++-
 tests/extradep.test                         |    2 +-
 tests/extradep2.test                        |    2 +-
 tests/{extra10.test => objext-pr10128.test} |   42 +++++++++++++++++++-------
 tests/pr300-lib.test                        |   10 +++++-
 tests/pr300-ltlib.test                      |    9 ++++-
 tests/primary-prefix-invalid-couples.tap    |    2 +-
 tests/primary-prefix-valid-couples.test     |    2 +-
 15 files changed, 70 insertions(+), 32 deletions(-)
 copy tests/{extra10.test => objext-pr10128.test} (53%)

diff --git a/NEWS b/NEWS
index 699f2af..4f4f4bd 100644
--- a/NEWS
+++ b/NEWS
@@ -263,6 +263,11 @@ New in 1.11.2:
 
 Bugs fixed in 1.11.2:
 
+* Bugs introduced by 1.11.2:
+
+  - Automake now correctly recognizes the prefix/primary combination
+   `pkglibexec_SCRIPTS' as valid.
+
 * Bugs introduced by 1.11:
 
   - The parallel-tests driver no longer produces erroneous results with
diff --git a/THANKS b/THANKS
index a5a70e2..d9b6663 100644
--- a/THANKS
+++ b/THANKS
@@ -80,6 +80,7 @@ David Pashley         address@hidden
 David Zaroski          address@hidden
 Dean Povey             address@hidden
 Dennis J. Linse                address@hidden
+Dennis Schridde                address@hidden
 Derek R. Price         address@hidden
 Diab Jerius            address@hidden
 Didier Cassirame       address@hidden
diff --git a/automake.in b/automake.in
index c08ed82..aa65e56 100644
--- a/automake.in
+++ b/automake.in
@@ -7,8 +7,8 @@ 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, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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
@@ -2947,7 +2947,7 @@ sub handle_scripts
     # useful to sometimes distribute scripts verbatim.  This happens
     # e.g. in Automake itself.
     &am_install_var ('-candist', 'scripts', 'SCRIPTS',
-                    'bin', 'sbin', 'libexec', 'pkgdata',
+                    'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
                     'noinst', 'check');
 }
 
diff --git a/doc/automake.texi b/doc/automake.texi
index d8f98c9..a346233 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -24,7 +24,7 @@ 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, 2011 Free Software
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
 Foundation, Inc.
 
 @quotation
@@ -7056,11 +7056,12 @@ prefix as with other primaries.
 @vindex sbin_SCRIPTS
 @vindex libexec_SCRIPTS
 @vindex pkgdata_SCRIPTS
address@hidden pkglibexec_SCRIPTS
 @vindex noinst_SCRIPTS
 @vindex check_SCRIPTS
 
 Scripts can be installed in @code{bindir}, @code{sbindir},
address@hidden, or @code{pkgdatadir}.
address@hidden, @code{pkglibexecdir}, or @code{pkgdatadir}.
 
 Scripts that need not be installed can be listed in
 @code{noinst_SCRIPTS}, and among them, those which are needed only by
diff --git a/lib/am/library.am b/lib/am/library.am
index db096c7..4045558 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1999, 2003, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1999, 2003, 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
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index 3cd2941..dd958fd 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2003, 2005, 2008, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 2003, 2005, 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
diff --git a/lib/am/program.am b/lib/am/program.am
index c0e188f..42c585e 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 2009, 2010
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 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
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78312a6..9c95e29 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,8 @@
 ## Process this file with automake to create Makefile.in
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 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
@@ -46,6 +47,7 @@ cond17.test \
 gcj6.test \
 override-conditional-2.test \
 java-nobase.test \
+objext-pr10128.test \
 pr8365-remake-timing.test \
 lex-subobj-nodep.test \
 remake-am-pr10111.test \
diff --git a/tests/extradep.test b/tests/extradep.test
index c32b44b..3b46de9 100755
--- a/tests/extradep.test
+++ b/tests/extradep.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 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
diff --git a/tests/extradep2.test b/tests/extradep2.test
index f6ad8c7..37483d6 100755
--- a/tests/extradep2.test
+++ b/tests/extradep2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 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
diff --git a/tests/extra10.test b/tests/objext-pr10128.test
similarity index 53%
copy from tests/extra10.test
copy to tests/objext-pr10128.test
index f44b1e2..0692164 100755
--- a/tests/extra10.test
+++ b/tests/objext-pr10128.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -14,29 +14,47 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that wildcards in EXTRA_DIST are honoured.
-# Suggested by observations from Braden McDaniel.
+# Test for automake bug#10128: $(OBJEXT) redefinition causes
+# $(foo_OBJECTS) to be defined as empty.
 
-required=GNUmake
 . ./defs || Exit 1
 
+set -e
+
 echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am <<'END'
-EXTRA_DIST=*.foo
+LINK = echo >$@ Linked $@ from
+OBJEXT = fasl
+EXEEXT =
+
+noinst_PROGRAMS = foo zardoz
+foo_SOURCES = foo.lisp
+zardoz_SOURCES = mu1.lisp mu2.lisp
+
+## Un-commenting this is enough to make the test pass.  Weird!
+##.lisp.o:
+
+.lisp.fasl:
+       touch $@
+
 .PHONY: test
-test: distdir
-       diff a.foo $(distdir)/a.foo
-       diff b.foo $(distdir)/b.foo
-       test ! -r $(distdir)/c.bar
+test:
+       test '$(foo_OBJECTS)'    = 'foo.fasl'
+       test '$(zardoz_OBJECTS)' = 'mu1.fasl mu2.fasl'
 END
 
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
 
-echo aaa > a.foo
-echo bbb > b.foo
-echo ccc > c.foo
 ./configure
 $MAKE test
+touch foo.lisp mu1.lisp mu2.lisp
+$MAKE all
+cat foo
+cat zardoz
+test "`cat foo`"    = "Linked foo from foo.fasl"
+test "`cat zardoz`" = "Linked zardoz from mu1.fasl mu2.fasl"
+
+:
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index 53dae5e..673845e 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2010, 2011, 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
@@ -45,7 +46,12 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -Wno-extra-portability --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 18201e6..24584e3 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011 Free Software
+# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,12 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -Wno-extra-portability --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"
 
 # A rule in the Makefile should create subdir.
 test ! -d subdir
diff --git a/tests/primary-prefix-invalid-couples.tap 
b/tests/primary-prefix-invalid-couples.tap
index 297d559..5f6ccb4 100755
--- a/tests/primary-prefix-invalid-couples.tap
+++ b/tests/primary-prefix-invalid-couples.tap
@@ -81,7 +81,7 @@ for primary in $primaries; do
       prefixes_ok='bin sbin libexec pkglibexec'
       ;;
     SCRIPTS)
-      prefixes_ok='bin sbin libexec pkgdata'
+      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
       ;;
     DATA)
       prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
diff --git a/tests/primary-prefix-valid-couples.test 
b/tests/primary-prefix-valid-couples.test
index e075db6..8d03030 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -57,7 +57,7 @@ for p in lib pkglib; do
   echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
 done
 
-for p in bin sbin libexec pkgdata; do
+for p in bin sbin libexec pkglibexec pkgdata; do
   echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
 done
 


hooks/post-receive
-- 
GNU Automake