removing git commit id from the VERSION file, since it is ambiguous for packaged versions vs. versions installed by "make install" (and complicated to build cleanly anyway)

3 files changed, 2 insertions, 8 deletions

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 5f72683..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-VERSION export-subst
diff --git a/Makefile b/Makefile
index 062816c..9f5028a 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 # © 2008-2010 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Licensed under GPL v3 or later
 
-MONKEYSPHERE_VERSION:=$(shell head -n1 Changelog | sed 's/.*(\([^-]*\)).*/\1/')
+MONKEYSPHERE_VERSION = `head -n1 Changelog | sed 's/.*(\([^-]*\)).*/\1/'`
 
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
@@ -17,9 +17,6 @@ MANPREFIX ?= $(PREFIX)/share/man
 # nothing actually needs to be built now.
 all: 
 
-VERSION: Changelog
-	sed 's/^Monkeysphere .*$$/Monkeysphere '$(MONKEYSPHERE_VERSION)'/' -i VERSION
-
 debian-package:
 	git buildpackage -uc -us
 
@@ -42,7 +39,7 @@ install: all installman
 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
-	install -m 0644 VERSION $(DESTDIR)$(PREFIX)/share/monkeysphere
+	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
 	install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 8acae53..0000000
--- a/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-Monkeysphere 0.30~pre
-git revision $Format:%H$