[dropping automake list] On 03/13/2012 01:30 PM, Stefano Lattarini wrote: > [CC:ing Ralf, as I'd like to hear his opinion here] > > Reference: > <http://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00078.html> > > On 03/13/2012 01:14 PM, Stefano Lattarini wrote: >> >> Now that I think about it, I'm not sure whether it was done "by design" from >> the beginning, >> > And I also missed Ralf's answer here: > > <http://comments.gmane.org/gmane.comp.gnu.gsasl.general/52> > > So we're in a sort of a tie here: some users think that the current Automake > behaviour is a feature (and I lean toward that position), other ones (with > Ralf among them, apparently) believe it's a bug. Hmmm. What now? > We finally decided that the older behaviour was a bug. We've thus fixed it (in the automake maint branch, fix to appear in automake 1.11.4), and I now propose the attached patch against gnulib-tool. OK to push?
Regards, Stefano
>From 00b0341603620881f19a83e63eb02fe8589a9ec7 Mon Sep 17 00:00:00 2001 Message-Id: <00b0341603620881f19a83e63eb02fe8589a9ec7.1332357746.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Tue, 13 Mar 2012 10:51:08 +0100 Subject: [PATCH] gnulib-tool: fix imprecise comments w.r.t. an automake bug It's not just Automake versions < 1.9b that creates an empty pkgdatadir at installation time if pkgdata_DATA is specified to empty; modern automake versions do this as well, at least until automake 1.11.4 (not yet released at the moment of writing, but soon to appear). That behaviour was generally considered a feature rather than a bug, at least until this discussion: <http://lists.gnu.org/archive/html/automake/2012-03/msg00014.html> See also automake bugs #10997 and #11030. * gnulib-tool (func_emit_lib_Makefile_am): Adjust comments. Add reference to relevant automake bug numbers. (func_emit_tests_Makefile_am): Likewise. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- ChangeLog | 18 ++++++++++++++++++ gnulib-tool | 12 ++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0076e06..d3f3ec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2012-03-21 Stefano Lattarini <stefano.lattar...@gmail.com> + + gnulib-tool: fix imprecise comments w.r.t. an automake bug + + It's not just Automake versions < 1.9b that creates an empty + pkgdatadir at installation time if pkgdata_DATA is specified + to empty; modern automake versions do this as well, at least + until automake 1.11.4 (not yet released at the moment of writing, + but soon to appear). That behaviour was generally considered a + feature rather than a bug, at least until this discussion: + <http://lists.gnu.org/archive/html/automake/2012-03/msg00014.html> + + See also automake bugs #10997 and #11030. + + * gnulib-tool (func_emit_lib_Makefile_am): Adjust comments. Add + reference to relevant automake bug numbers. + (func_emit_tests_Makefile_am): Likewise. + 2012-03-20 Reuben Thomas <r...@sc3d.org> announce-gen: use Digest::SHA when possible diff --git a/gnulib-tool b/gnulib-tool index eef9ab6..fae325c 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3348,8 +3348,10 @@ func_emit_lib_Makefile_am () echo "noinst_HEADERS =" echo "noinst_LIBRARIES =" echo "noinst_LTLIBRARIES =" - # Automake versions < 1.9b create an empty pkgdatadir at installation time - # if you specify pkgdata_DATA to empty. This is a workaround. + # Automake versions < 1.11.3 create an empty pkgdatadir at + # installation time if you specify pkgdata_DATA to empty. + # See automake bugs #10997 and #11030. + # So we need this workaround. if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then echo "pkgdata_DATA =" fi @@ -3669,8 +3671,10 @@ func_emit_tests_Makefile_am () echo "check_LIBRARIES = libtests.a" fi fi - # Automake versions < 1.9b create an empty pkgdatadir at installation time - # if you specify pkgdata_DATA to empty. This is a workaround. + # Automake versions < 1.11.3 create an empty pkgdatadir at + # installation time if you specify pkgdata_DATA to empty. + # See automake bugs #10997 and #11030. + # So we need this workaround. if grep '^pkgdata_DATA *+=' "$tmp"/main_snippets "$tmp"/longrunning_snippets > /dev/null; then echo "pkgdata_DATA =" fi -- 1.7.9
