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 bfcc7b1dcb6372279f92193fbcf819c98e3ab10c..c9e247a5575c0cba376749a48cb2325c1f204c76 100644 (file)
--- 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 79d8637d237ed26634f57bf1781c08d66b4110e6..a2f71708b918c9cfbe62c579c3b6dec5e658cd95 100644 (file)
--- 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