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

[secnet] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ba5c0da..c9e247a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0
+VERSION:=0.4.1
 
 @SET_MAKE@
 
@@ -127,6 +127,8 @@ conffile.yy.h:      conffile.yy.c
 conffile.tab.c:        conffile.y
 # End of manual dependencies section
 
+conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
+
 secnet:        $(OBJECTS)
        $(MAKE) version.o # *.o $(filter-out %.o, $^)
        $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
@@ -146,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 \
@@ -164,7 +166,7 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
 
 check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
        $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
-       diff -u ipaddrset-test.expected ipaddrset-test.new
+       diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
 
 .PRECIOUS: eax-%-test