From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 20 Jul 2011 17:59:15 +0000 (+0200)
Subject: Update for new google account.
X-Git-Tag: v1.6.1~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2611b167fde9713807e85bcf38b9fcceae03167;p=yubikey-personalization

Update for new google account.
---

diff --git a/Makefile.am b/Makefile.am
index b08f458..b46ede2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,7 @@ release:
 		echo "Try this instead:"; \
 		echo "  make release USER=[GOOGLEUSERNAME] KEYID=[PGPKEYID]"; \
 		echo "For example:"; \
-		echo "  make release USER=simon@yubico.com KEYID=2117364A"; \
+		echo "  make release USER=simonyubico@gmail.com KEYID=2117364A"; \
 		exit 1; \
 	fi
 	@head -3 $(srcdir)/NEWS | grep -q "Version $(VERSION) .released `date -I`" || \
diff --git a/ykpers4win.mk b/ykpers4win.mk
index 061e1ef..0596262 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -29,11 +29,19 @@
 LIBYUBIKEYVERSION=1.7
 PROJECT=yubikey-personalization
 PACKAGE=ykpers
-VERSION=1.5.2
-USER=simon@yubico.com
-KEYID=2117364A
 
-all: hack-wine ykpers4win32 ykpers4win64
+all: usage hack-wine ykpers4win32 ykpers4win64
+
+.PHONY: usage
+usage:
+	@if test -z "$(USER)" || test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
+		echo "Try this instead:"; \
+		echo "  make USER=[GOOGLEUSERNAME] PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
+		echo "For example:"; \
+		echo "  make USER=simonyubico@gmail.com PGPKEYID=2117364A VERSION=1.6.0"; \
+		exit 1; \
+	fi
+
 
 DLLS=$(HOME)/.wine/drive_c/windows/system32
 .PHONY: hack-wine
@@ -66,7 +74,7 @@ ykpers4win64:
 	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=64 HOST=x86_64-w64-mingw32 CHECK=
 
 upload-ykpers4win:
-	gpg --detach-sign --default-key $(KEYID) \
+	gpg --detach-sign --default-key $(PGPKEYID) \
 		$(PACKAGE)-$(VERSION)-win$(BITS).zip
 	gpg --verify $(PACKAGE)-$(VERSION)-win$(BITS).zip.sig
 	googlecode_upload.py \