fix location of the primary public keyring for the new reorganization

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index 9c07f0d..6b674f1
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,11 @@
-MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+#!/usr/bin/make -f
+
+# Makefile for monkeysphere
+
+# (c) 2008 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Licensed under GPL v3 or later
+
+MONKEYSPHERE_VERSION = `head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
 
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
@@ -22,7 +29,8 @@ tarball: clean
 
 debian-package: tarball
        tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
-       cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
+       sed -i "s|__VERSION__|$(MONKEYSPHERE_VERSION)|g" monkeysphere-$(MONKEYSPHERE_VERSION)/src/common
+       cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION)
        (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
@@ -42,8 +50,8 @@ install: all installman
        mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
-       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)$(PREFIX)/bin
-       install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
+       install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
+       install src/monkeysphere-authentication src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 etc/gnupg-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-host.conf$(ETCSUFFIX)