From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Nov 2017 14:07:31 +0000 (+0000)
Subject: build: Tolerate building from a git checkout, but with git not installed.
X-Git-Tag: v0.4.2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=509a30c079b5a8f5f996c6ccce102c512d4a238d

build: Tolerate building from a git checkout, but with git not installed.

This can happen in chroots.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile.in b/Makefile.in
index bfcc7b1..c9e247a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,7 +148,7 @@ check: eax-aes-test.confirm eax-serpent-test.confirm \
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
-	@set -ex; if test -e .git; then \
+	@set -ex; if test -e .git && type -p git >/dev/null; then \
 		v=$$(git describe --match 'v*'); v=$${v#v}; \
 		if ! git diff --quiet HEAD; then v="$$v+"; fi; \
 	else \
diff --git a/debian/changelog b/debian/changelog
index 79d8637..a2f7170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 secnet (0.4.2~) unstable; urgency=medium
 
-  * 
+  Build etc. fixes:
+  * Tolerate building from a git checkout, but with git not installed.
+    (This can happen in chroots.)
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 25 Nov 2017 14:04:42 +0000