Fix build of 'make dist' generated tarballs

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4c4b18dd7688eb61f1c3b1683b1cf627e51d116a..e129d9fceb274c6995423e0b1c97274c325def29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,11 +12,15 @@ BINARY_AGE=0
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
-GIT_VERSION=`git describe --abbrev=6 --dirty --always`
-MAJOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f1 -d.`
-MINOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f2 -d.`
-MICRO_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f3 -d.`
-EXTRA_VERSION=`echo $GIT_VERSION | cut -f2 -d-`
+if test \( -d .git \); then
+    GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+else
+    GIT_VERSION=`sh -c '. ./version'`
+fi
+MAJOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $1}'`
+MINOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $2}'`
+MICRO_VERSION=`echo $GIT_VERSION | awk -F- '{print $1}' | awk -F. '{print $3}'`
+EXTRA_VERSION=`echo $GIT_VERSION | awk -F- '{print $2}'`
 
 if test \( "x$EXTRA_VERSION" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
@@ -25,14 +29,6 @@ else
     EXTRA_VERSION=0
 fi
 
-if test \( "x$HASH_VERSION" != "x" \); then
-    if test \( "x$DIRTY_VERSION" != "x" \); then
-        VERSION=${VERSION}+${HASH_VERSION}+local
-    else
-        VERSION=${VERSION}+${HASH_VERSION}
-    fi
-fi
-
 if test \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 fi
@@ -51,7 +47,6 @@ AC_SUBST(MINOR_VERSION)
 AC_SUBST(MICRO_VERSION)
 AC_SUBST(EXTRA_VERSION)
 AC_SUBST(GIT_VERSION)
-AC_SUBST(HASH_VERSION)
 
 AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
 AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)
@@ -1901,6 +1896,7 @@ manual/de/dist/ps/Makefile
 manual/de/dist/html/Makefile
 manual/de/dist/txt/Makefile
 claws-mail.pc
+version
 ])
 
 dnl Output the configuration summary