fixing Makefile configfile installation goof.

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index a07d7d242ac26351857bea652ff5310a197883af..2925eb279b487e1577716499bddb20899ea785e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
 ETCPREFIX ?= 
+ETCSUFFIX ?= 
 PREFIX ?= /usr
+MANPREFIX ?= $(PREFIX)/share/man
 
 all: keytrans
 
@@ -31,7 +33,7 @@ clean:
 
 # this target is to be called from the tarball, not from the git
 # working dir!
-install: all
+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
@@ -39,13 +41,16 @@ install: all
        install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
-       install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+       install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere.conf$(ETCSUFFIX)
+       install -m 0644 etc/monkeysphere-server.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-server.conf$(ETCSUFFIX)
 
 installman:
-       mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8
-       install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1
-       install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7
-       install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8
+       mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8
+       gzip -n man/*/*
+       install man/man1/* $(DESTDIR)$(MANPREFIX)/man1
+       install man/man7/* $(DESTDIR)$(MANPREFIX)/man7
+       install man/man8/* $(DESTDIR)$(MANPREFIX)/man8
+       gzip -d man/*/*
 
 releasenote:
        ./utils/build-releasenote