move src/subcommands to srv/share, and add common file to src/share (update Makefile...

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 212f174333fc3f8633cbae1e43f4d893fac41344..0ec2030f9e1c5eca4c8aedcb2450da230eacd086 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -47,15 +47,16 @@ 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
-       install -m 0644 src/subcommands/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
-       install -m 0644 src/subcommands/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
-       install -m 0644 src/subcommands/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
+       install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+       install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
+       install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
+       install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
        install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)