X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Makefile;h=765c3e92343e21a0c3a4b5860eae20b9f71d8daa;hb=9556a2f1659aa6432cc74469a25d401319d74e79;hp=ff0ee0c86dc2abe60a44d55e34413955d1dfd7bf;hpb=ac8f7d1c1addf1cea1c6ffb071de1fcfdc60931b;p=monkeysphere.git

diff --git a/Makefile b/Makefile
index ff0ee0c..765c3e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
-MONKEYSPHERE_VERSION=`head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+
+# these defaults are for debian.  porters should probably adjust them
+# before calling make install
+ETCPREFIX ?= 
+PREFIX ?= /usr
 
 all: keytrans
 
@@ -10,15 +15,34 @@ tarball: clean
 	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).tar.gz
+	tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
-debian-package: 
-	debuild -uc -us
+debian-package: tarball
+	tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
+	cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
+	(cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
+	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
 clean:
 	$(MAKE) -C src/keytrans clean
 	# clean up old monkeysphere packages lying around as well.
 	rm -f monkeysphere_*
 
-.PHONY: all clean tarball debian-package
+# 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
+	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 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
+
+.PHONY: all clean tarball debian-package install