diff options
author | Rob Browning <rlb@defaultvalue.org> | 2024-06-30 12:27:38 -0500 |
---|---|---|
committer | Rob Browning <rlb@defaultvalue.org> | 2024-07-26 16:37:41 -0500 |
commit | 6bd70136d96e73542e6725bc490199e17f56ee92 (patch) | |
tree | ba55c04bb6948b34ed9c4d2f003a2d242bfe51ba | |
parent | 8535682dda9c1f8471883628dbd5c5897b57fda0 (diff) | |
download | guile-6bd70136d96e73542e6725bc490199e17f56ee92.tar.gz |
Ensure GUILE-VERSION changes propagate to .version and Makefiles
Have .version depend on the Makefile, and move our
CONFIG_STATUS_DEPENDENCIES setting to an AC_SUBST, as recommended by the
automake info pages "Rebuilding Makefiles" section, so that changes to
GUILE-VERSION will update the VERSION, etc. in the generated Makefiles.
* Makefile.am (CONFIG_STATUS_DEPENDENCIES): drop.
($(top_srcdir/.version)): depend on Makefile.
* configure: add GUILE-VERSION to CONFIG_STATUS_DEPENDENCIES via
AC_SUBST.
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b2ac5539e..c74761628 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,8 +110,6 @@ endif !HAVE_READLINE clean-local: rm -rf cache/ -CONFIG_STATUS_DEPENDENCIES = GUILE-VERSION - gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b .PHONY: gen-ChangeLog gen-ChangeLog: @@ -133,7 +131,7 @@ assert-no-store-file-names: fi BUILT_SOURCES += $(top_srcdir)/.version -$(top_srcdir)/.version: +$(top_srcdir)/.version: Makefile echo $(VERSION) > $@-t && mv $@-t $@ gen-tarball-version: echo $(VERSION) > $(distdir)/.tarball-version diff --git a/configure.ac b/configure.ac index 0dcb71cce..262b171f1 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERB AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT) AC_CONFIG_SRCDIR([GUILE-VERSION]) +AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/GUILE-VERSION']) . $srcdir/GUILE-VERSION GUILE_VERSION="$PACKAGE_VERSION" |