From a04e0fe371db8a46a823a6bf02c838496cc12756 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= <ast@mugami.com>
Date: Wed, 9 Feb 2011 13:48:32 +0000
Subject: [PATCH] Makefile: get version from git
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Pull the version number from git tags, rather than a text file in git.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@mugami.com>
---
 Makefile    |    4 ++--
 version.txt |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 version.txt

diff --git a/Makefile b/Makefile
index 45d2764..1e838bb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js
 SIZZLE_DIR = ${SRC_DIR}/sizzle
 QUNIT_DIR = ${TEST_DIR}/qunit
 
-JQ_VER = $(shell cat version.txt)
-VER = sed "s/@VERSION/${JQ_VER}/"
+GIT_VER = $(shell git describe --tags --always --dirty)
+VER = sed "s/@VERSION/${GIT_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
diff --git a/version.txt b/version.txt
deleted file mode 100644
index 30e4503..0000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.5.1pre
\ No newline at end of file
-- 
1.7.10.4