From: Rob Browning <rlb@defaultvalue.org>
To: 72084@debbugs.gnu.org
Subject: bug#72084: GUILE-VERSION changes don't propagate to .version and Makefile(s)
Date: Fri, 12 Jul 2024 19:36:44 -0500 [thread overview]
Message-ID: <87msmmw2jn.fsf@trouble.defaultvalue.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 91 bytes --]
Changing GUILE-VERSION doesn't update these deriviative files. This
patch may fix that:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Ensure-GUILE-VERSION-changes-propagate-to-.version-a.patch --]
[-- Type: text/x-diff, Size: 1801 bytes --]
From 485b9c282e0b4e6c6317666129e433e90acf4dea Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 30 Jun 2024 12:27:38 -0500
Subject: [PATCH 1/1] 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.
---
Makefile.am | 4 +---
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"
--
2.43.0
[-- Attachment #3: Type: text/plain, Size: 198 bytes --]
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
next reply other threads:[~2024-07-13 0:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-13 0:36 Rob Browning [this message]
2024-07-28 19:40 ` bug#72084: GUILE-VERSION changes don't propagate to .version and Makefile(s) Rob Browning
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87msmmw2jn.fsf@trouble.defaultvalue.org \
--to=rlb@defaultvalue.org \
--cc=72084@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).