Update for new google account.

diff --git a/Makefile.am b/Makefile.am
index b08f4589fe92499fb599c49f7cb89dda74f27b6a..b46ede244d088a752a9d47d88c57282943ced3b9 100644 (file)
--- 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 061e1ef70fab94c1161b19289749b84805b88a32..05962627f80dd28594e2d65b44d676132f35b2f3 100644 (file)
--- 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 \