make git version macro work if compiled outside of src dir

diff --git a/configure.ac b/configure.ac
index faf7090603fbdd907147c76ee436fbdce35fa1ce..f47024c508b63b1161d94fd618841435ed53992c 100644 (file)
--- 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 70af79161b3287dbb7d600880fddf437ba92c927..1fb1f902d52652e76acd5fd6c86bda96c50cabab 100644 (file)
--- 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)