diff options
| author | Wojtek Kosior <koszko@koszko.org> | 2023-12-22 22:12:10 +0100 |
|---|---|---|
| committer | W. Kosior <koszko@koszko.org> | 2024-05-03 14:46:59 +0200 |
| commit | 6074777059f02d29c012b4bfe906477c1f38e0f3 (patch) | |
| tree | 83b4007963f5d6f3201d4a2b3f0f91bc4dbeb821 | |
| parent | 77af8aba7c289435cbdee8998f71bcd92cd0fb2d (diff) | |
| download | guix-6074777059f02d29c012b4bfe906477c1f38e0f3.tar.gz guix-6074777059f02d29c012b4bfe906477c1f38e0f3.zip | |
build: Fix `make dist` in VPATH builds.
* Makefile.am (gen-ChangeLog): Look for .git in `$(top_srcdir)`.
(gen-AUTHORS): Look for .git in `$(top_srcdir)`.
* po/doc/local.mk (%D%/%.pot): Make sure destination directory exists.
Change-Id: Ib6d78f08f8791d2f8e1758614d21c41f04a39b0a
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | po/doc/local.mk | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 77c05ff63b..ba440b1ac8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1009,16 +1009,19 @@ gen-tarball-version: echo $(SOURCE_DATE_EPOCH) > $(distdir)/.tarball-timestamp gen-ChangeLog: - $(AM_V_GEN)set -e; \ + $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \ + set -e; \ export LC_ALL=en_US.UTF-8; \ export TZ=UTC0; \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; + mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \ + fi gen-AUTHORS: - $(AM_V_GEN)set -e; \ + $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \ + set -e; \ rm -f "$(distdir)/AUTHORS"; \ export LC_ALL=en_US.UTF-8; \ export TZ=UTC0; \ diff --git a/po/doc/local.mk b/po/doc/local.mk index 77ec4721e3..f902652f7f 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -45,6 +45,7 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@gnu.org" %D%/%.pot: $(srcdir)/doc/%.texi + $(MKDIR_P) %D% # directory might be absent in VPATH build $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ -p "$@-t" $(POT_OPTIONS) date="$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ |