nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: 'assert-no-store-file-names' depends on ChangeLog. 

This fixes a bug whereby "make distcheck -j4" might invoke
'assert-no-store-file-names' when the temporary $(distdir)/cl-t
exists (and contains store file names), before $(distdir)/ChangeLog has
been created.

* Makefile.am (assert-no-store-file-names): Depend on $(distdir)/ChangeLog.
(dist-hook): Depend on $(distdir)/ChangeLog instead of 'gen-ChangeLog'.
(gen-ChangeLog): Add $(distdir)/ChangeLog left of the colon.
This commit is contained in:
Ludovic Courtès 2017-05-14 11:46:08 +02:00
parent b6b281a5ba
commit dfd248648f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -518,7 +518,7 @@ guix-binary.%.tar.xz:
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version dist-hook: $(distdir)/ChangeLog gen-AUTHORS gen-tarball-version
dist-hook: assert-no-store-file-names dist-hook: assert-no-store-file-names
distcheck-hook: assert-binaries-available assert-final-inputs-self-contained distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
@ -531,7 +531,7 @@ $(top_srcdir)/.version:
gen-tarball-version: gen-tarball-version:
echo $(VERSION) > "$(distdir)/.tarball-version" echo $(VERSION) > "$(distdir)/.tarball-version"
gen-ChangeLog: gen-ChangeLog $(distdir)/ChangeLog:
$(AM_V_GEN)if test -d .git; then \ $(AM_V_GEN)if test -d .git; then \
$(top_srcdir)/build-aux/gitlog-to-changelog \ $(top_srcdir)/build-aux/gitlog-to-changelog \
> $(distdir)/cl-t; \ > $(distdir)/cl-t; \
@ -638,7 +638,7 @@ update-guix-package:
"`git rev-parse HEAD`" "`git rev-parse HEAD`"
# Make sure we're not shipping a file that embeds a local /gnu/store file name. # Make sure we're not shipping a file that embeds a local /gnu/store file name.
assert-no-store-file-names: assert-no-store-file-names: $(distdir)/ChangeLog
$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \ $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \
--exclude=*.info-[0-9] --exclude=*.dot \ --exclude=*.info-[0-9] --exclude=*.dot \
--exclude=*.eps --exclude-dir=bootstrap \ --exclude=*.eps --exclude-dir=bootstrap \