From: j8takagi <j8takagi@nifty.com>
Date: Wed, 24 Jul 2013 23:58:18 +0000 (+0900)
Subject: make gittagで、VERSIONファイル記載のバージョンがタグとして未登録の場合だけgit tagを実行するよう仕様変更
X-Git-Tag: v0.2p22~2
X-Git-Url: https://j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c6960b1dcf3116da04f39233d889b6ee04384c0;p=YACASL2.git

make gittagで、VERSIONファイル記載のバージョンがタグとして未登録の場合だけgit tagを実行するよう仕様変更
---

diff --git a/Makefile b/Makefile
index ca55acb..1730124 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ CAT := cat
 CP := cp
 ECHO := echo
 GITTAG := git tag
+GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
@@ -21,7 +22,10 @@ prefix ?= ~
 bindir ?= $(prefix)/bin
 
 VERSION = $(shell $(CAT) VERSION)
-VERSIONFILES = include/package.h test/system/casl2/opt_v/0.txt test/system/comet2/opt_v/0.txt test/system/dumpword/opt_v/0.txt
+VERSIONFILES = include/package.h \
+        test/system/casl2/opt_v/0.txt \
+        test/system/comet2/opt_v/0.txt \
+        test/system/dumpword/opt_v/0.txt
 
 all: build doc gtags
 
@@ -62,7 +66,7 @@ $(VERSIONFILES): VERSION
 	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
 gittag: VERSION
-	$(GITTAG) $(VERSION)
+	$(GITTAG) | $(GREP) $(VERSION) || $(GITTAG) $(VERSION)
 
 distclean: cmd-clean src-distclean gtags-clean version-clean clean