summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-01 11:45:38 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-01 11:45:38 -0500
commit2c427b22f6a780cbf0d4e22fce26071727e985a1 (patch)
tree9035bb0b1adc2ef2bcf395ec3d3ae3d3c47ea866 /Makefile
parentef9a47ba86dbd16bbff44cc01e5a2485823bbbdd (diff)
transition to the perl-based keytrans implementation.
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0284a8a..2c6077e 100755
--- 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,12 @@ 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 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