From: Patrick von Reth <vonreth@kde.org>
Date: Thu, 2 Aug 2012 10:58:22 +0000 (+0200)
Subject: make git version macro work if compiled outside of src dir
X-Git-Tag: v3.1.8~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=409e020d2636a81947820d50c79d52fbede2c53c;p=thirdparty%2Fccache.git

make git version macro work if compiled outside of src dir
---

diff --git a/configure.ac b/configure.ac
index faf709060..f47024c50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ if test -f $srcdir/dev.mk.in && test "$RUN_FROM_BUILD_FARM" != yes; then
     AC_MSG_NOTICE(Enabling developer mode)
     AC_CONFIG_FILES([dev.mk])
     include_dev_mk='include dev.mk'
-    version=`(git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
+    version=`(git --git-dir=$srcdir/.git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
     echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >version.c
 elif test ! -f $srcdir/version.c; then
     AC_MSG_WARN(unable to determine ccache version)
diff --git a/dev.mk.in b/dev.mk.in
index 70af79161..1fb1f902d 100644
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -8,7 +8,7 @@ XSLTPROC = xsltproc
 MANPAGE_XSL = /etc/asciidoc/docbook-xsl/manpage.xsl
 
 version := \
-    $(shell (git describe --dirty || git describe || echo vunknown) \
+    $(shell (git --git-dir=$(srcdir)/.git describe --dirty || git --git-dir=$(srcdir)/.git describe || echo vunknown) \
             2>/dev/null | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g')
 
 dist_dir = ccache-$(version)