[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: maint: Resurrect running `make' from a tarball.
From: |
guix-commits |
Subject: |
01/07: maint: Resurrect running `make' from a tarball. |
Date: |
Fri, 19 Apr 2024 10:47:50 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit bb089f76227666e11e6949038c4fd9e130e047a3
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Apr 17 18:58:23 2024 +0200
maint: Resurrect running `make' from a tarball.
This is a follow-up to commit
8b972da068708a8b17f3ab153ea940690ca49ca9
Makefile.am: Auto-configure Git on 'make'.
* configure.ac (in_git_p): New conditional.
* Makefile.am (nodist_noinst_DATA): Use it to only enable this when building
from Git.
Change-Id: I09a90a59a4933a8cdb04124467d38209171f2a57
---
Makefile.am | 5 +++++
configure.ac | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 25b3eb3378..98008c528d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1241,7 +1241,12 @@ COMMIT_MSG_MAGIC =
VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
cp etc/git/commit-msg $@; \
fi
+# The etc/git/ config files are not distributed and have no use when building
+# from a tarball. Do not add dependencies on these to *_DATA when building
+# from a tarball, as that breaks the build.
+if in_git_p
nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg
+endif
# Downloading up-to-date PO files.
diff --git a/configure.ac b/configure.ac
index ecbd596a34..8c3a06da37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,6 +265,16 @@ dnl Documentation translation.
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])
+AC_MSG_CHECKING([if building from git])
+if test -e .git; then
+ in_git_p=yes
+else
+ in_git_p=no
+fi
+AC_MSG_RESULT([$in_git_p])
+AM_CONDITIONAL([in_git_p],
+ [test "x$in_git_p" = "xyes"])
+
case "$storedir" in
/gnu/store)
;;
- branch master updated (e9e60b3a1d -> ba52975ea9), guix-commits, 2024/04/19
- 06/07: Revert "maint: Generate 'doc/version-LANG.texi' reproducibly.", guix-commits, 2024/04/19
- 03/07: maint: Cater for running `make dist' from a tarball., guix-commits, 2024/04/19
- 04/07: maint: Support running `./bootstrap' from a tarball., guix-commits, 2024/04/19
- 01/07: maint: Resurrect running `make' from a tarball.,
guix-commits <=
- 05/07: maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'., guix-commits, 2024/04/19
- 07/07: Revert "maint: Generate 'doc/version.texi' reproducibly.", guix-commits, 2024/04/19
- 02/07: maint: Support `make doc-pot-update' from a tarball., guix-commits, 2024/04/19