fix makefile, and remove now-unneeded dirs in debian packaging

diff --git a/Makefile b/Makefile
index 212f174333fc3f8633cbae1e43f4d893fac41344..6acb3f43d46b66c32e1200c1986a0c6de85b1370 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,10 @@ clean:
 # this target is to be called from the tarball, not from the git
 # working dir!
 install: all installman
-       mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere/
-       mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/m $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/ma
+       mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
+       mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
        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 src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere

diff --git a/packaging/debian/monkeysphere.dirs b/packaging/debian/monkeysphere.dirs
index 1f9e66b710b878255a4354546fd9c6ca03f70fec..e07fb2c67971ec19a57f5f54295db442b1265eb5 100644 (file)
--- a/packaging/debian/monkeysphere.dirs
+++ b/packaging/debian/monkeysphere.dirs
@@ -1,6 +1,4 @@
 var/lib/monkeysphere
-var/lib/monkeysphere/authorized_keys
-var/lib/monkeysphere/tmp
 usr/bin
 usr/sbin
 usr/share