Remove the test for the root user, effectively reverting part of

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 7db645a9f987ae03e5bc5911073f8f9ba7986eb6..8d9ab2f1bb0dc33a2b769fc6794662ae6070e00a 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 # (c) 2008 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Licensed under GPL v3 or later
 
-MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+MONKEYSPHERE_VERSION = `head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
 
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
@@ -29,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)
 
@@ -49,7 +50,7 @@ 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 src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
        install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere