From: simon75j <simon75j@b62f149e-849f-11dd-9899-c7ba65f7c4c7>
Date: Fri, 8 May 2009 06:57:31 +0000 (+0000)
Subject: EXTRA_DIST magic to get all wiki files.
X-Git-Tag: yubikey-personalisation_0.97-1~83
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e6c7749ea8ed5f7a0ce68f9252c3c5abaedc1d;p=yubikey-personalization.old

EXTRA_DIST magic to get all wiki files.


git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@85 b62f149e-849f-11dd-9899-c7ba65f7c4c7
---

diff --git a/Makefile.am b/Makefile.am
index 29ca773..874a4f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,25 +63,33 @@ ctests = selftest$(EXEEXT)
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
 
+# Dist docs from wiki.
+EXTRA_DIST = doc/ReadMe.wiki doc/UsbhidIssue.wiki
+
 # Release
 
+PROJECT=yubikey-personalization
+USER=simon75j
+
 ChangeLog:
 	svn2cl
 
-PROJECT=yubikey-personalization
+check-doc-dist:
+	perl -pe "s,^EXTRA_DIST = .*,EXTRA_DIST = `echo doc/*.wiki`," < Makefile.am > tmp
+	diff -ur Makefile.am tmp || (echo 'error: please update Makefile.am'; exit 1)
 
 release:
 	rm -f ChangeLog
-	make ChangeLog distcheck
+	make check-doc-dist ChangeLog distcheck
 	gpg -b $(PACKAGE)-$(VERSION).tar.gz
 	gpg --verify $(PACKAGE)-$(VERSION).tar.gz.sig
 	svn copy https://$(PROJECT).googlecode.com/svn/trunk/ \
 	 https://$(PROJECT).googlecode.com/svn/tags/$(PACKAGE)-$(VERSION) \
 	 -m "Tagging the $(VERSION) release of the $(PACKAGE) project."
 	googlecode_upload.py -s "OpenPGP signature for $(PACKAGE) $(VERSION)." \
-	 -p $(PROJECT) -u simon75j $(PACKAGE)-$(VERSION).tar.gz.sig
+	 -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz.sig
 	googlecode_upload.py -s "$(PACKAGE) $(VERSION)" \
-	 -p $(PROJECT) -u simon75j $(PACKAGE)-$(VERSION).tar.gz 
+	 -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz 
 	cp README ../wiki-$(PROJECT)/ReadMe.wiki && \
 		cd ../wiki-$(PROJECT) && \
 		svn commit -m Sync. ReadMe.wiki