From 39f79cdef2ebf1bb302891e556cb59babcf1f48b Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 19 Sep 2014 15:05:18 +0200
Subject: [PATCH] Improve makefile.

---
 Makefile | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index cc423a5..9e2cbee 100644
--- a/Makefile
+++ b/Makefile
@@ -31,17 +31,17 @@ PACKAGE = yubikey-ksm
 CODE = .htaccess Makefile NEWS README ykksm-config.php ykksm-db.sql	\
 	ykksm-decrypt.php ykksm-export ykksm-gen-keys	\
 	ykksm-import ykksm-utils.php ykksm-checksum
-DOCS = doc/DecryptionProtocol.wiki doc/DesignGoals.wiki		\
-	doc/GenerateKeys.wiki doc/GenerateKSMKey.wiki		\
-	doc/ImportKeysToKSM.wiki doc/Installation.wiki		\
-	doc/KeyProvisioningFormat.wiki doc/ServerHardening.wiki	\
-	doc/SyncMonitor.wiki
+DOCS = doc/DecryptionProtocol.txt doc/DesignGoals.txt		\
+	doc/GenerateKeys.txt doc/GenerateKSMKey.txt		\
+	doc/ImportKeysToKSM.txt doc/Installation.txt		\
+	doc/KeyProvisioningFormat.txt doc/ServerHardening.txt	\
+	doc/SyncMonitor.txt
 MANS = ykksm-checksum.1 ykksm-export.1 ykksm-gen-keys.1		\
 	ykksm-import.1
 
 all:
 	@echo "Try 'make install' or 'make symlink'."
-	@echo "Docs: doc/Installation"
+	@echo "See doc/Installation.txt for more information"
 	@exit 1
 
 # Installation rules.
@@ -82,8 +82,6 @@ symlink:
 PROJECT = $(PACKAGE)
 
 $(PACKAGE)-$(VERSION).tgz: $(FILES) $(MANS)
-	git submodule init
-	git submodule update
 	mkdir $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)/doc
 	cp $(CODE) $(PACKAGE)-$(VERSION)/
 	cp $(MANS) $(PACKAGE)-$(VERSION)/
@@ -112,13 +110,6 @@ NAME_ykksm-import = 'Tool to import key data on the YKKSM-KEYPROV format.'
 man: $(MANS)
 
 release: dist
-	@if test -z "$(KEYID)"; then \
-		echo "Try this instead:"; \
-		echo "  make release KEYID=[PGPKEYID]"; \
-		echo "For example:"; \
-		echo "  make release KEYID=2117364A"; \
-		exit 1; \
-	fi
 	@head -1 NEWS | grep -q "Version $(VERSION) (released `date -I`)" || \
                 (echo 'error: You need to update date/version in NEWS'; exit 1)
 	@if test ! -d "$(YUBICO_WWW_REPO)"; then \
@@ -126,8 +117,8 @@ release: dist
 		echo "Make sure that YUBICO_WWW_REPO is set"; \
 		exit 1; \
 	fi
-	gpg --detach-sign --default-key $(KEYID) $(PACKAGE)-$(VERSION).tgz
+	gpg --detach-sign $(PACKAGE)-$(VERSION).tgz
 	gpg --verify $(PACKAGE)-$(VERSION).tgz.sig
-	git tag -u $(KEYID) -m "$(PACKAGE)-$(VERSION)" $(PACKAGE)-$(VERSION)
+	git tag -s -m "$(PACKAGE) $(VERSION)" $(PACKAGE)-$(VERSION)
 	$(YUBICO_WWW_REPO)/publish $(PROJECT) $(VERSION) $(PACKAGE)-$(VERSION).tgz*
 	@echo "Release created and tagged, remember to git push && git push --tags"