X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Makefile;h=0284a8a0e52405ad4b29d8942df6b4d0315936a2;hb=e71c7bb4dff26178f714cd0fcdbb3058effa4066;hp=765c3e92343e21a0c3a4b5860eae20b9f71d8daa;hpb=93a51ab8ec443b64d36bfe2cab5cd0f2f962ae5f;p=monkeysphere.git

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 765c3e9..0284a8a
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,18 @@
-MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+#!/usr/bin/make -f
+
+# Makefile for monkeysphere
+
+# (c) 2008-2009 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Licensed under GPL v3 or later
+
+MONKEYSPHERE_VERSION = `head -n1 packaging/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,16 +23,22 @@ 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)
-	tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
+	ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
+	echo $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
+	tar -ch --exclude='*~' monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
 debian-package: tarball
 	tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
-	cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
+	cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION)
 	(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,18 +46,34 @@ 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)$(PREFIX)/share/doc/monkeysphere
+install: all installman
+	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 $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
 	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
+	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+	install -m 0644 VERSION $(DESTDIR)$(PREFIX)/share/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/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+	install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+	install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+	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 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-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)
+	install -m 0644 etc/monkeysphere-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-authentication.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
+.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote