me
/
guix
Archived
1
0
Fork 0
Code

maint: Resurrect running `make' from a tarball. 

This is a follow-up to commit
    8b972da068
    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
master
Janneke Nieuwenhuizen 2024-04-17 18:58:23 +02:00
parent e9e60b3a1d
commit bb089f7622
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1241,7 +1241,12 @@ COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
cp etc/git/commit-msg $@; \ cp etc/git/commit-msg $@; \
fi 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 nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg
endif
# Downloading up-to-date PO files. # Downloading up-to-date PO files.

10
configure.ac
View File

@ -265,6 +265,16 @@ dnl Documentation translation.
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) 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 case "$storedir" in
/gnu/store) /gnu/store)
;; ;;