Merge remote branch 'jrollins/master'

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 7ca73efd9f7aa2118eaef4c083d3ef5fdc930516..710d77963e658ec8e6be2fdcc3e9d930cc2445c6 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
@@ -83,8 +83,12 @@ installman:
 releasenote:
        ./utils/build-releasenote
 
-test:
-       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
+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