[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-621-g4e4dae5

[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=4e4dae500390d2ace681e4e4bc4c590ecdca38c6

The branch, maint has been updated
       via  4e4dae500390d2ace681e4e4bc4c590ecdca38c6 (commit)
      from  971000c121b9b79b787435f1eaaa76caa37986ee (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 4e4dae500390d2ace681e4e4bc4c590ecdca38c6
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 3 09:06:09 2012 +0100

    install: pkglibexec_SCRIPTS is a valid prefix/primary combination
    
    It makes little sense for `libexec_SCRIPTS' to be accepted as valid
    while `pkglibexec_SCRIPTS' is not.  So fix this inconsistency by
    explicitly allowing `pkglibexec_SCRIPTS' as well.  It is worth
    noting that the inconsistency has been there for a long time,
    but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
    about primary/prefix mismatch fixed and extended" has made it
    noisy enough to be noticed.
    
    * automake.in (handle_scripts): Also list `pkglibexec' among the
    prefixes valid for the `SCRIPTS' primary.
    * doc/automake.texi (Scripts): Likewise.
    * tests/primary-prefix-valid-couples.test: Update.
    * THANKS: Likewise.
    * NEWS: Likewise.
    
    Reported by Dennis Schridde on the automake list:
    <http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>

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

Summary of changes:
 NEWS                                      |    5 +++++
 THANKS                                    |    1 +
 automake.in                               |    2 +-
 doc/automake.texi                         |    3 ++-
 tests/primary-prefix-invalid-couples.test |    2 +-
 tests/primary-prefix-valid-couples.test   |    2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 599f19f..2e572e4 100644
--- a/NEWS
+++ b/NEWS
@@ -82,6 +82,11 @@ New in 1.11.0a:
 
 Bugs fixed in 1.11.0a:
 
+* 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' test driver works around a GNU make 3.80 bug with
diff --git a/THANKS b/THANKS
index e9da06c..e9c6db8 100644
--- a/THANKS
+++ b/THANKS
@@ -78,6 +78,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 a852195..a689b63 100644
--- a/automake.in
+++ b/automake.in
@@ -3091,7 +3091,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 cebe084..0c4dc01 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7099,11 +7099,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/tests/primary-prefix-invalid-couples.test 
b/tests/primary-prefix-invalid-couples.test
index 88e0817..c3d6471 100755
--- a/tests/primary-prefix-invalid-couples.test
+++ b/tests/primary-prefix-invalid-couples.test
@@ -79,7 +79,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 36ff5d8..6eb4149 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