talons

commit 9375966944e6fef9cc85820b329c46125a93b3f3
parent a0773b18b0651f754b806ce07c61e564ffc21a8c
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 30 May 2013 14:37:19 +0200

Get rid of version.in - forgotten files

Diffstat:
M
Makefile.am
 | 
6
+++---
M
configure.ac
 | 
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -17,7 +17,6 @@ EXTRA_DIST = \
 	claws-mail.png \
 	autogen.sh \
 	claws-features.h.in \
-	version.in \
 	version
 
 # hicolor icon theme, base class of all icon themes
@@ -78,10 +77,11 @@ clawsinclude_HEADERS = \
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES
 
-dist-hook: ChangeLog
+dist-local: ChangeLog
 
-clean-local:
+maintainer-clean-local:
 	@rm -f ChangeLog
+	@rm -f version
 
 ChangeLog: version
 	@./tools/gitlog2changelog.py 3.9.0 > ChangeLog
diff --git a/configure.ac b/configure.ac
@@ -18,9 +18,10 @@ if test \( -d .git \); then
 	AC_MSG_ERROR([*** git not found. See http://git-scm.com/])
     else
 	GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+	echo "echo ${GIT_VERSION}" > ./version
     fi
 else
-    GIT_VERSION=`sh -c '. ./version'`
+    GIT_VERSION=`sh -c ". ./$srcdir/version"`
 fi
 MAJOR_VERSION=${GIT_VERSION%%.*}
 MINOR_VERSION=${GIT_VERSION#*.}
@@ -1969,7 +1970,6 @@ manual/de/dist/ps/Makefile
 manual/de/dist/html/Makefile
 manual/de/dist/txt/Makefile
 claws-mail.pc
-version
 ])
 
 dnl Output the configuration summary