diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2012-08-07 17:22:21 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2012-08-07 17:22:21 +0200 |
| commit | 649f568c0aa92264eaf400f205e452f06c358de3 (patch) | |
| tree | f674947180c60e07796f364e77e50e3c6de9b099 /configure.ac | |
| parent | fc49942a6a10314ccfa4b121717ee2e65b9e5fae (diff) | |
| parent | 409e020d2636a81947820d50c79d52fbede2c53c (diff) | |
| download | ccache-649f568c0aa92264eaf400f205e452f06c358de3.tar.gz | |
Merge branch 'maint'
* maint:
make git version macro work if compiled outside of src dir
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6cd50ac1..ddf43a88 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,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) |