1 From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
2 From: Stefano Lattarini <stefano.lattarini@gmail.com>
3 Date: Tue, 3 Jan 2012 09:06:09 +0100
4 Subject: [PATCH] install: pkglibexec_SCRIPTS is a valid prefix/primary combination
6 It makes little sense for `libexec_SCRIPTS' to be accepted as valid
7 while `pkglibexec_SCRIPTS' is not. So fix this inconsistency by
8 explicitly allowing `pkglibexec_SCRIPTS' as well. It is worth
9 noting that the inconsistency has been there for a long time,
10 but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
11 about primary/prefix mismatch fixed and extended" has made it
12 noisy enough to be noticed.
14 * automake.in (handle_scripts): Also list `pkglibexec' among the
15 prefixes valid for the `SCRIPTS' primary.
16 * doc/automake.texi (Scripts): Likewise.
17 * tests/primary-prefix-valid-couples.test: Update.
21 Reported by Dennis Schridde on the automake list:
22 <http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
27 doc/automake.texi | 3 ++-
28 tests/primary-prefix-invalid-couples.test | 2 +-
29 tests/primary-prefix-valid-couples.test | 2 +-
30 6 files changed, 11 insertions(+), 4 deletions(-)
32 diff --git a/NEWS b/NEWS
33 index 599f19f..2e572e4 100644
36 @@ -82,6 +82,11 @@ New in 1.11.0a:
38 Bugs fixed in 1.11.0a:
40 +* Bugs introduced by 1.11.2:
42 + - Automake now correctly recognizes the prefix/primary combination
43 + `pkglibexec_SCRIPTS' as valid.
45 * Bugs introduced by 1.11:
47 - The `parallel-tests' test driver works around a GNU make 3.80 bug with
48 diff --git a/THANKS b/THANKS
49 index e9da06c..e9c6db8 100644
52 @@ -78,6 +78,7 @@ David Pashley david@davidpashley.com
53 David Zaroski cz253@cleveland.Freenet.Edu
54 Dean Povey dpovey@wedgetail.com
55 Dennis J. Linse Dennis.J.Linse@SAIC.com
56 +Dennis Schridde devurandom@gmx.net
57 Derek R. Price derek.price@openavenue.com
58 Diab Jerius djerius@cfa.harvard.edu
59 Didier Cassirame faded@free.fr
60 diff --git a/automake.in b/automake.in
61 index a852195..a689b63 100644
64 @@ -3091,7 +3091,7 @@ sub handle_scripts
65 # useful to sometimes distribute scripts verbatim. This happens
66 # e.g. in Automake itself.
67 &am_install_var ('-candist', 'scripts', 'SCRIPTS',
68 - 'bin', 'sbin', 'libexec', 'pkgdata',
69 + 'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
73 diff --git a/doc/automake.texi b/doc/automake.texi
74 index cebe084..0c4dc01 100644
75 --- a/doc/automake.texi
76 +++ b/doc/automake.texi
77 @@ -7099,11 +7099,12 @@ prefix as with other primaries.
79 @vindex libexec_SCRIPTS
80 @vindex pkgdata_SCRIPTS
81 +@vindex pkglibexec_SCRIPTS
82 @vindex noinst_SCRIPTS
85 Scripts can be installed in @code{bindir}, @code{sbindir},
86 -@code{libexecdir}, or @code{pkgdatadir}.
87 +@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
89 Scripts that need not be installed can be listed in
90 @code{noinst_SCRIPTS}, and among them, those which are needed only by
91 diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
92 index 88e0817..c3d6471 100755
93 --- a/tests/primary-prefix-invalid-couples.test
94 +++ b/tests/primary-prefix-invalid-couples.test
95 @@ -79,7 +79,7 @@ for primary in $primaries; do
96 prefixes_ok='bin sbin libexec pkglibexec'
99 - prefixes_ok='bin sbin libexec pkgdata'
100 + prefixes_ok='bin sbin libexec pkglibexec pkgdata'
103 prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
104 diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
105 index 36ff5d8..6eb4149 100755
106 --- a/tests/primary-prefix-valid-couples.test
107 +++ b/tests/primary-prefix-valid-couples.test
108 @@ -57,7 +57,7 @@ for p in lib pkglib; do
109 echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
112 -for p in bin sbin libexec pkgdata; do
113 +for p in bin sbin libexec pkglibexec pkgdata; do
114 echo "${p}_SCRIPTS = $p.sh" >> Makefile.am