X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=Makefile;h=d3927d74da85def2cdef38462e0e472457b77627;hb=7c756f57a818067b407d60806b690e2195c0279f;hp=f97701f410288fdc44e73606a2ae4911c7b72e97;hpb=8f99edc5826c646aeab0cf4b55655946804c13d3;p=monkeysphere-validation-agent.git

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index f97701f..d3927d7
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,32 @@
 #!/usr/bin/make -f
 
-# Makefile for xul-ext-monkeysphere
+# Makefile for msva-perl
 
 # © 2010 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Licensed under GPL v3 or later
 
-VERSION=`dpkg-parsechangelog -lChangelog | grep ^Version: | cut -f2 -d\ `
+VERSION := $(shell dpkg-parsechangelog -lChangelog | grep ^Version: | cut -f2 -d\ )
+DEBIAN_VERSION=`dpkg-parsechangelog | grep ^Version: | cut -f2 -d\ `
 
-all: msva-perl.1
+MANPAGES=msva-perl.1 msva-query-agent.1
 
-msva-perl.1: msva-perl
-	pod2man msva-perl msva-perl.1
+all: $(MANPAGES) Crypt/Monkeysphere/MSVA.pm
 
-release: tarball
-	git tag -s msva-perl/$(VERSION) -m "releasing msva-perl version $(VERSION)"
+%.1: %
+	pod2man $< $@
 
-tarball: msva-perl msva.protocol.README COPYING Makefile
-	git archive --format tar --prefix=msva-perl-$(VERSION)/ HEAD | gzip -n -9 > ../msva-perl-$(VERSION).tar.gz
+Crypt/Monkeysphere/MSVA.pm: Changelog
+	sed -i "s/^  \\\$$VERSION = '[a-z0-9.~A-Z]*';$$/  \$$VERSION = '$(VERSION)';/" $@
 
 clean: 
-	rm -f msva-perl.1
+	rm -f $(MANPAGES)
+
+debian-package:
+	git buildpackage -uc -us
+
+upstream-tag:
+	git tag -s msva-perl/$(VERSION) -m "releasing msva-perl version $(VERSION)"
+debian-tag:
+	git tag -s msva-perl_debian/$(DEBIAN_VERSION) -m "tagging msva-perl debian packaging version $(DEBIAN_VERSION)"
 
-.PHONY: release tarball all clean
+.PHONY: upstream-tag debian-package debian-tag all clean