actually ship new upstream changelog

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 07e8fb972825f1cc36246f127d217ac3fd3a06f0..4b0c9e1295a844899f5524c04c9b808f6856b191 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 
 # 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/'`
+MONKEYSPHERE_VERSION = `head -n1 changelog | sed 's/.*(\([^-]*\)).*/\1/'`
 
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
@@ -21,8 +21,10 @@ tarball: clean
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
        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
+       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)
 
@@ -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
@@ -61,6 +68,7 @@ install: all installman
        install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
        install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+       install changelog $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
        install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)
        install -m 0644 etc/monkeysphere-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-authentication.conf$(ETCSUFFIX)
@@ -76,7 +84,12 @@ installman:
 releasenote:
        ./utils/build-releasenote
 
-test:
-       ./tests/basic
+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