no need for recursive removal of a single file

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c6077e463c0efb305cc500a4852943395aecb67..9381b033f4e5cc9991d34ceda0c46d3bc70c41e7 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # Makefile for monkeysphere
 
-# (c) 2008-2009 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# © 2008-2010 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Licensed under GPL v3 or later
 
 MONKEYSPHERE_VERSION = `head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
@@ -22,7 +22,9 @@ tarball: clean
        mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
-       echo $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/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)
 
@@ -37,6 +39,9 @@ debian-package: tarball
 freebsd-distinfo: 
        ./utils/build-freebsd-distinfo
 
+macports-portfile:
+       ./utils/build-macports-portfile
+
 clean:
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
@@ -52,6 +57,8 @@ install: all installman
        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
+       install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
+       install -m 0755 src/share/checkperms $(DESTDIR)$(PREFIX)/share/monkeysphere
        install -m 0755 src/share/keytrans $(DESTDIR)$(PREFIX)/share/monkeysphere
        ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/pem2openpgp
        ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh
@@ -76,4 +83,12 @@ installman:
 releasenote:
        ./utils/build-releasenote
 
-.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote
+test: test-keytrans test-basic
+
+test-basic:
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/basic
+
+test-keytrans:
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
+
+.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test