X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Makefile;h=4ea389862aa72908b2b7e6727646e0ad5e8c3fe5;hb=37045570e881c240c9ff597a6d0612589d7c26db;hp=defd15a03988a11bafb74974245ded918ea8bb3a;hpb=2c6c9e84ef5417987d90d45d28be6894df5afe35;p=monkeysphere.git

diff --git a/Makefile b/Makefile
index defd15a..4ea3898 100644
--- 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
 
@@ -24,6 +26,11 @@ debian-package: tarball
 	(cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
+# don't explicitly depend on the tarball, since our tarball
+# (re)generation is not idempotent even when no source changes.
+freebsd-distinfo: 
+	./utils/build-freebsd-distinfo
+
 clean:
 	$(MAKE) -C src/keytrans clean
 	# clean up old monkeysphere packages lying around as well.
@@ -31,19 +38,24 @@ 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/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8
 	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 -m 0644 src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere
+	install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(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
-	install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1
-	install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7
-	install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8
-	install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+	install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
+	install -m 0644 etc/monkeysphere-server.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-server.conf$(ETCSUFFIX)
+
+installman:
+	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