Merge branch 'master' into debian

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index f52c82cc1485a3826e6f07260956bd2a2dfec667..9f5028aec19df8ded227c7280e820e1d35cfb45b 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -17,17 +17,8 @@ MANPREFIX ?= $(PREFIX)/share/man
 # nothing actually needs to be built now.
 all: 
 
-tarball: clean
-       rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
-       ln -s ../Changelog ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
-       echo Monkeysphere $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
-       echo -n "git revision " >> monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
-       git rev-parse HEAD >> monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
-       tar -ch --exclude='*~' monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
-       rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
-
 debian-package:
-       git buildpackage -uc -us --git-upstream-branch=master --git-debian-branch=debian --git-no-pristine-tar --git-ignore-new
+       git buildpackage -uc -us
 
 # don't explicitly depend on the tarball, since our tarball
 # (re)generation is not idempotent even when no source changes.
@@ -48,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