Merge commit 'jrollins/master'

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 0284a8a0e52405ad4b29d8942df6b4d0315936a2..9873d32bc1752a8893048c8bc725ecf608552c6d 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,8 @@ 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)
@@ -40,7 +38,6 @@ freebsd-distinfo:
        ./utils/build-freebsd-distinfo
 
 clean:
-       $(MAKE) -C src/keytrans clean
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
 
@@ -52,9 +49,13 @@ install: all installman
        mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 VERSION $(DESTDIR)$(PREFIX)/share/monkeysphere
-       install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
+       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/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
@@ -76,4 +77,7 @@ installman:
 releasenote:
        ./utils/build-releasenote
 
-.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote
+test:
+       ./tests/basic
+
+.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test