Hi,

Attached is a trivial patch to the top-level Makefile
to stop 'make check' generating an error when there is
no .git directory present (which will happen with the
stable snapshot tarball).

I've already applied this patch in the just-released stable snapshot.

cheers,

Ian.

-- 
Ian Beckwith - i...@erislabs.net - http://erislabs.net/ianb/
GPG fingerprint: AF6C C0F1 1E74 424B BCD5  4814 40EC C154 A8BA C1EA
Listening to: Tom Waits - Rain Dogs - Time
From 7ffc813d8166df4406a58ef0a0bd872dd65f60dc Mon Sep 17 00:00:00 2001
From: Ian Beckwith <i...@erislabs.net>
Date: Sat, 24 Apr 2010 21:56:30 +0100
Subject: [PATCH] make check: avoid an error when no .git dir present.

* Makefile (sc_prefer_ac_check_funcs_once): Don't run git grep
if .git directory is not present (e.g. in stable snapshot tarballs).
---
 ChangeLog |    6 ++++++
 Makefile  |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3a6fc9..94ce020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-24  Ian Beckwith  <i...@erislabs.net>
+
+	make check: avoid an error when no .git dir present.
+	* Makefile (sc_prefer_ac_check_funcs_once): Don't run git grep
+	if .git directory is not present (e.g. in stable snapshot tarballs).
+
 2010-04-24  Bruno Haible  <br...@clisp.org>
 
 	Avoid a gcc warning.
diff --git a/Makefile b/Makefile
index d2878d6..9ddfadc 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ info html dvi pdf:
 check: sc_prefer_ac_check_funcs_once
 
 sc_prefer_ac_check_funcs_once:
+	[ -d .git ] && \
 	git grep -w -l AC_CHECK_FUNCS modules && \
 	  { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS in modules/ 1>&2; \
 	    exit 1; } || :
-- 
1.7.0.5

Attachment: signature.asc
Description: Digital signature

Reply via email to