Merge commit 'dkg/master'

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 7ab188d7887884467490a3a74afd9ce7d110f062..057707aad99a409865a56d3aa7a1c8f70b39ee48 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
 
@@ -14,7 +16,7 @@ tarball: clean
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
        mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
-       ln -s ../COPYING ../etc ../Makefile ../man ../src  monkeysphere-$(MONKEYSPHERE_VERSION)
+       ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
        tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
@@ -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,17 +38,26 @@ clean:
 
 # this target is to be called from the tarball, not from the git
 # working dir!
-install: all
-       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)/$(ETCPREFIX)/etc
-       mkdir -p $(DESTDIR)/$(PREFIX)/var/lib/monkeysphere/authorized_keys
-       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)/$(PREFIX)/bin
-       install src/monkeysphere-server $(DESTDIR)/$(PREFIX)/sbin
-       install src/common $(DESTDIR)/$(PREFIX)/share/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 etc/* $(DESTDIR)$(ETCPREFIX)/etc
-
-.PHONY: all clean tarball debian-package install
+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-server $(DESTDIR)$(PREFIX)/sbin
+       install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+       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-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
+
+.PHONY: all clean tarball debian-package install releasenote