Bruno Haible via Gnulib discussion list <bug-gnulib@gnu.org> writes: > Basil L. Contovounesios wrote: >> Should 'make dist' also fail when $(srcdir)/.git does not exist > > Definitely not. It would prevent "make dist" from succeeding when > run from an unpacked tarball.
Agreed. Thanks for these fixes! I pushed the attached patch to make the usage of 'dist-hook' a bit more consistent across gnulib. /Simon
From bafecc478e9a351fd0f98846110a34d4bde6944a Mon Sep 17 00:00:00 2001 From: Simon Josefsson <si...@josefsson.org> Date: Tue, 14 Jan 2025 07:25:24 +0100 Subject: [PATCH] git-version-gen: Use an indirect 'dist-hook' make rule instead. * build-aux/git-version-gen: Doc fix. --- ChangeLog | 5 +++++ build-aux/git-version-gen | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4e849e8a8..86f886e236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2025-01-14 Simon Josefsson <si...@josefsson.org> + + git-version-gen: Use an indirect 'dist-hook' make rule instead. + * build-aux/git-version-gen: Doc fix. + 2025-01-13 Paul Eggert <egg...@cs.ucla.edu> fts, savedir: avoid glibc 2.2 readdir ENOENT bug diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index c1aac364d1..4ede151c8d 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2024-12-28.20; # UTC +scriptversion=2025-01-14.06; # UTC # Copyright (C) 2007-2025 Free Software Foundation, Inc. # @@ -80,7 +80,9 @@ scriptversion=2024-12-28.20; # UTC # $(top_srcdir)/.version: # echo '$(VERSION)' > $@-t # mv $@-t $@ -# dist-hook: +# dist-hook: tarball-version +# .PHONY: tarball-version +# tarball-version # echo '$(VERSION)' > $(distdir)/.tarball-version # # To setup support for "git archive" tarballs, use the following: -- 2.47.1
signature.asc
Description: PGP signature
