Fix build of 'make dist' generated tarballs

The version is set in stone before the 'make dist' run.
In the cases where no .git directory is found, like generated
tarballs, the stone is summoned instead.

diff --git a/.gitignore b/.gitignore
index c5fd1e3..ced542e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -489,3 +489,4 @@
 /TAGS
 /tools/Makefile
 /tools/Makefile.in
+/version

diff --git a/Makefile.am b/Makefile.am
index 05788ec..fa09d87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,9 @@ EXTRA_DIST = \
        claws-mail.desktop \
        claws-mail.png \
        autogen.sh \
-       claws-features.h.in
+       claws-features.h.in \
+       version.in \
+       version
 
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps

diff --git a/configure.ac b/configure.ac
index 94b0ab2..e129d9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,11 @@ BINARY_AGE=0
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
-GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+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}'`
@@ -1892,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

diff --git a/version.in b/version.in
new file mode 100644 (file)
index 0000000..141efac
--- /dev/null
+++ b/version.in
@@ -0,0 +1 @@
+echo "@GIT_VERSION@"