Fix out-of-tree build

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Dec 4, 2012 · a9b6b9a · a9b6b9a
1 parent 1ba0871
commit a9b6b9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)