Update Makefile auto-versioning for git

Add objects to .gitignore

diff --git a/.gitignore b/.gitignore
index e69de29..d1081d4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*~
+*.elc
+*.info
+emchat-version.texi
+emchat-version.el
+auto-autoloads.el
+custom-load.el
+custom-defines.el
+prepsrc.el

diff --git a/Makefile b/Makefile
index 57b87e8..792efe1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Makefile for EMchat   -*-Makefile-*-
 ##
-## Copyright (C) 2001 - 2008 Steve Youngs
+## Copyright (C) 2001 - 2010 Steve Youngs
 ##
 ## This file is part of EMchat.
 
@@ -32,7 +32,7 @@
 ## IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PACKAGE = emchat
-VER = 0.9.5
+VER = 0.9.6
 
 SHELL = /bin/sh
 # Cygwin # Comment out line above and uncomment the following line
@@ -151,8 +151,8 @@ emchat-version.el:
        echo ";;; Automatically generated file -- DO NOT EDIT OR DELETE" > $@
        echo ";;;###autoload" >> $@
        echo "(defconst emchat-version" >> $@
-       if [ -d "./{arch}" -a -x `which tla 2>/dev/null` ]; then \
-               printf '  "%s"' `tla logs -f|tail -n1` >> $@; \
+       if [ -x `which git 2>/dev/null` ]; then \
+               printf '  "%s"' `git describe` >> $@; \
        else \
                echo -n '  "$(VER)"' >> $@; \
        fi
@@ -162,8 +162,8 @@ emchat-version.el:
 version: emchat-version.el
 
 emchat-version.texi:
-       if [ -d "./{arch}" -a -x `which tla 2>/dev/null` ]; then \
-               printf "@set VERSION %s" `tla logs -f|tail -n1|sed s/@/@@/` > $@; \
+       if [ -x `which git 2>/dev/null` ]; then \
+               printf "@set VERSION %s" `git describe` > $@; \
        else \
                echo "@set VERSION $(VER)" > $@; \
        fi