X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Makefile;h=9f5028aec19df8ded227c7280e820e1d35cfb45b;hb=0fac6fc8a4e82c1639d9467a6aaf9274d04209dd;hp=212f174333fc3f8633cbae1e43f4d893fac41344;hpb=54b8a4cdbedafdde87cfa35dc61a48d6a2d46bc6;p=monkeysphere.git

diff --git a/Makefile b/Makefile
index 212f174..9f5028a 100755
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 
 # Makefile for monkeysphere
 
-# (c) 2008 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# © 2008-2010 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Licensed under GPL v3 or later
 
-MONKEYSPHERE_VERSION = `head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+MONKEYSPHERE_VERSION = `head -n1 Changelog | sed 's/.*(\([^-]*\)).*/\1/'`
 
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
@@ -14,49 +14,46 @@ ETCSUFFIX ?=
 PREFIX ?= /usr
 MANPREFIX ?= $(PREFIX)/share/man
 
-all: keytrans
+# nothing actually needs to be built now.
+all: 
 
-keytrans:
-	$(MAKE) -C src/keytrans
-
-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 ../tests monkeysphere-$(MONKEYSPHERE_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
-	sed -i "s|__VERSION__|$(MONKEYSPHERE_VERSION)|g" monkeysphere-$(MONKEYSPHERE_VERSION)/src/common
-	cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION)
-	(cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
-	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
+debian-package:
+	git buildpackage -uc -us
 
 # 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
 
+macports-portfile:
+	./utils/build-macports-portfile
+
 clean:
-	$(MAKE) -C src/keytrans clean
 	# clean up old monkeysphere packages lying around as well.
 	rm -f monkeysphere_*
 
 # this target is to be called from the tarball, not from the git
 # working dir!
 install: all installman
-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere/
-	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/m $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/ma
+	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/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
 	install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
-	install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
-	install -m 0644 src/subcommands/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
-	install -m 0644 src/subcommands/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
-	install -m 0644 src/subcommands/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
-	install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
+	install -m 0755 src/share/checkperms $(DESTDIR)$(PREFIX)/share/monkeysphere
+	install -m 0755 src/share/keytrans $(DESTDIR)$(PREFIX)/share/monkeysphere
+	ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/pem2openpgp
+	ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh
+	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 Changelog $(DESTDIR)$(PREFIX)/share/doc/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)
@@ -72,4 +69,12 @@ installman:
 releasenote:
 	./utils/build-releasenote
 
-.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote
+test: test-keytrans test-basic
+
+test-basic:
+	MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/basic
+
+test-keytrans:
+	MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
+
+.PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test