mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Ensure GUILE-VERSION changes propagate to .version and Makefiles

Browse source 
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.
This commit is contained in:
Rob Browning 2024-06-30 12:27:38 -05:00
parent 8535682dda
commit 6bd70136d9
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -110,8 +110,6 @@ endif !HAVE_READLINE
clean-local: clean-local:
rm -rf cache/ rm -rf cache/
CONFIG_STATUS_DEPENDENCIES = GUILE-VERSION
gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b
.PHONY: gen-ChangeLog .PHONY: gen-ChangeLog
gen-ChangeLog: gen-ChangeLog:
@ -133,7 +131,7 @@ assert-no-store-file-names:
fi fi
BUILT_SOURCES += $(top_srcdir)/.version BUILT_SOURCES += $(top_srcdir)/.version
$(top_srcdir)/.version: $(top_srcdir)/.version: Makefile
echo $(VERSION) > $@-t && mv $@-t $@ echo $(VERSION) > $@-t && mv $@-t $@
gen-tarball-version: gen-tarball-version:
echo $(VERSION) > $(distdir)/.tarball-version echo $(VERSION) > $(distdir)/.tarball-version

1
configure.ac
View file

@ -40,6 +40,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERB
AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT) AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
AC_CONFIG_SRCDIR([GUILE-VERSION]) AC_CONFIG_SRCDIR([GUILE-VERSION])
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/GUILE-VERSION'])
. $srcdir/GUILE-VERSION . $srcdir/GUILE-VERSION
GUILE_VERSION="$PACKAGE_VERSION" GUILE_VERSION="$PACKAGE_VERSION"