Enable build from dist tarball independent of git.

This is necessary for downstream builds from
source rpm.

JIRA: VPP-498

Change-Id: I30ea51a19b153dc35ececbbca79b940fe4e3bc8a
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

diff --git a/Makefile b/Makefile
index 46c51dd..09a802a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -274,12 +274,17 @@ DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
 DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
 
 dist:
-       @git archive \
-         --prefix=$(DIST_SUBDIR)/ \
-         --format=tar \
-         -o $(DIST_FILE) \
-         HEAD
-       @git describe > $(BR)/.version
+       @if git rev-parse 2> /dev/null ; then \
+           git archive \
+             --prefix=$(DIST_SUBDIR)/ \
+             --format=tar \
+             -o $(DIST_FILE) \
+           HEAD ; \
+           git describe > $(BR)/.version ; \
+       else \
+           (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
+           src/scripts/version > $(BR)/.version ; \
+       fi
        @tar --append \
          --file $(DIST_FILE) \
          --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \