Fix out-of-tree build

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 33f136047cd749162e67e5bf5b5c71e09a84bcc7..9d2e2631803d28eceff1b4cba3803e501249bb2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,9 @@ $(SPEC): $(SPEC).in .version
                dirty="" && \
                numcomm="0"; \
        else \
+               if [ ! -d .git ]; then \
+                       export GIT_DIR="$(abs_srcdir)/.git";\
+               fi && \
                gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
                rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
                alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
@@ -122,6 +125,9 @@ $(DEBCHANGELOG): $(DEBCHANGELOG).in .version
                dirty="" && \
                numcomm="0"; \
        else \
+               if [ ! -d .git ]; then \
+                       export GIT_DIR="$(abs_srcdir)/.git";\
+               fi && \
                gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
                debver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
                alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \

diff --git a/TODO b/TODO
index 28eb55833c1fe78adb733c8547b12c5b9e334aec..eded351df848468816b4641b944d65cd06b5be02 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,8 +23,6 @@ find a way to autodetect the new ip on that interface
 
 Implement link auth via user/passwd
 
-check build out-of-tree for spec file
-
 general:
 add log to vty:
  - config (per subsystem/total)