summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Beckwith <ianb@erislabs.net>2010-04-26 09:26:35 +0200
committerJim Meyering <meyering@redhat.com>2010-04-26 09:29:45 +0200
commit3552ea714b8a640d547de5783b394f08be252ae0 (patch)
tree8f1fdceb7cdfb26ed0395957ded32e8d74b35e43
parent1534c83a9aef13ea3d292ebc353f3897dfd57986 (diff)
downloadgnulib-3552ea714b8a640d547de5783b394f08be252ae0.tar.gz
build: avoid "make check" failure without .git/ directory
* Makefile (sc_prefer_ac_check_funcs_once): Skip this test when there is no .git/ directory.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9208e2fdd9..8d6acc051c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-24 Ian Beckwith <ianb@erislabs.net>
+
+ build: avoid "make check" failure without .git/ directory
+ * Makefile (sc_prefer_ac_check_funcs_once): Skip this test when
+ there is no .git/ directory.
+
2010-04-25 Bruno Haible <bruno@clisp.org>
ptsname: Fix misuse of ttyname_r.
diff --git a/Makefile b/Makefile
index d2878d6493..0596ba6a57 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,11 @@ info html dvi pdf:
check: sc_prefer_ac_check_funcs_once
sc_prefer_ac_check_funcs_once:
- git grep -w -l AC_CHECK_FUNCS modules && \
- { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS in modules/ 1>&2; \
- exit 1; } || :
+ if test -d .git; then \
+ git grep -w -l AC_CHECK_FUNCS modules \
+ && { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS \
+ in modules/ 1>&2; exit 1; } || : \
+ else :; fi
# Regenerate some files that are stored in the repository.
regen: MODULES.html