Fix dependence on computed configure variables.

* doc/Makefile.am (common_dep): Depend on $(top_srcdir)/configure not
$(top_srcdir)/configure.ac so that changes to computed variables, such
as PACKAGE_VERSION, are seen.
* tests/Makefile.am ($(srcdir)/package.m4): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 251260d19519d68f473fc53e4a884192bd060d20..5f31ec68e03bfd8b705b672a310fadd6c49639e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Fix dependence on computed configure variables.
+       * doc/Makefile.am (common_dep): Depend on $(top_srcdir)/configure not
+       $(top_srcdir)/configure.ac so that changes to computed variables, such
+       as PACKAGE_VERSION, are seen.
+       * tests/Makefile.am ($(srcdir)/package.m4): Likewise.
+
 2008-07-20  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Update copyright dates for recent changes.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f04e47c52c84c6834d7d37955f51c9f02433bd18..0dd437277559227b94cdc7b869687936a7a005f1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,8 +53,8 @@ dist_man_MANS = $(srcdir)/bison.1
 EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
 MAINTAINERCLEANFILES += $(dist_man_MANS)
 
-# Depend on configure.ac to get version number changes.
-common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
+# Depend on configure to get version number changes.
+common_dep = $(top_srcdir)/configure $(srcdir)/common.x
 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab15a76a7b6b4a27b0ba3b1b87464f0d2c9de96b..c4a6e726384a9d0384483e1f618b9346d1e58542 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## package.m4.  ##
 ## ------------ ##
 
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+$(srcdir)/package.m4: $(top_srcdir)/configure
        { \
          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \