Its more useful and standard to actually output the 'help' output when

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index fc608d2717f8453f5c3e3a4909932352c0a9fe90..7ca73efd9f7aa2118eaef4c083d3ef5fdc930516 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,17 @@ ETCSUFFIX ?=
 PREFIX ?= /usr
 MANPREFIX ?= $(PREFIX)/share/man
 
-all: keytrans
-
-keytrans:
-       $(MAKE) -C src/keytrans
+# nothing actually needs to be built now.
+all: 
 
 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 $(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)
 
@@ -38,8 +39,10 @@ debian-package: tarball
 freebsd-distinfo: 
        ./utils/build-freebsd-distinfo
 
+macports-portfile:
+       ./utils/build-macports-portfile
+
 clean:
-       $(MAKE) -C src/keytrans clean
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
 
@@ -50,10 +53,17 @@ 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 src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
+       install -m 0644 VERSION $(DESTDIR)$(PREFIX)/share/monkeysphere
+       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
        install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+       install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
        install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
        install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
        install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
@@ -73,4 +83,8 @@ installman:
 releasenote:
        ./utils/build-releasenote
 
-.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote
+test:
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/basic
+
+.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test