From c53d18b1572c5b8f07cc8a71574257dc4edf3e1d Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sun, 27 Jul 2008 00:56:58 -0400 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ doc/Makefile.am | 4 ++-- tests/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 251260d1..5f31ec68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-27 Joel E. Denny + + 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 Update copyright dates for recent changes. diff --git a/doc/Makefile.am b/doc/Makefile.am index f04e47c5..0dd43727 100644 --- 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 ab15a76a..c4a6e726 100644 --- 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)])'; \ -- 2.47.2