build: Use git version for tarball and AC_INIT().

It's kind of silly to use "git" as the version string at all times
except for releases. This commit changes the name of the generated
tarball to use the output of git describe. Hence the "tarball"
target creates a tarball named according to the current git HEAD. For
compatibility we provide a symlink with the old name.

diff --git a/.gitignore b/.gitignore
index b9190f286953b5f6e9b28d205d0d3c5f85ffb822..6df2e505aba059b933bad7056e4cc12f1a303207 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ config.log
 config.status
 Makefile
 TODO
-paraslash-git.tar.bz2
+paraslash-*.tar.bz2
 web/dia/overview.pdf
 *.swp
 error2.h

diff --git a/Makefile.real b/Makefile.real
index a8e4767dbd689d482b93bc3c5947ef4faa2a2fb4..13933b78ac052b1bbd24a4c0b5e29e5c9de3b6c8 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -51,7 +51,7 @@ play_objs := $(addprefix $(object_dir)/, $(play_objs))
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+tarball_pfx := $(PACKAGE_TARNAME)-$(shell git describe --dirty)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
@@ -343,4 +343,5 @@ $(tarball):
        $(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
        $(Q) bzip2 -9 $(tarball_pfx).tar
        $(Q) ls -l $(tarball)
+       $(Q) ln -sf $(tarball) paraslash-git.tar.bz2
        $(Q) rm -rf $(tarball_pfx)

diff --git a/configure.ac b/configure.ac
index c3dd6b1f5491bb9c5bf4def2d64d754fc81ae89a..79b41a3addcf36f0066838c68edfea2b8de0b7c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@tuebingen.mpg.de])
+AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
+       [maan@tuebingen.mpg.de], [], [http://people.tuebingen.mpg.de/maan/paraslash/])
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])