From: j8takagi <j8takagi@nifty.com>
Date: Mon, 6 Jul 2026 14:20:40 +0000 (+0900)
Subject: make gittagの修正
X-Git-Tag: v0.6p12~3
X-Git-Url: https://www.j8takagi.net/gitweb?a=commitdiff_plain;h=1c4d61e034b5f5c02da2981946d7e66d025a4647;p=yacasl2.git

make gittagの修正
---

diff --git a/Makefile b/Makefile
index 966c2d7..4d23a63 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
         install uninstall \
         version gittag copyright \
         gitpush gitpushorigin gitpushgithub \
-        version_up___stamp \
+        version_up___stamp gittag___stamp \
         clean src-clean gtags-clean \
         test-clean doc-clean doc_inner-clean
 
diff --git a/git.mk b/git.mk
index b1c3378..808528c 100644
--- a/git.mk
+++ b/git.mk
@@ -15,13 +15,13 @@ gitpush___stamp: gittag___stamp
 	$(GIT) push github main --tags
 	$(GIT) rev-parse HEAD > $@
 
-gittag___stamp: version_up___stamp
-	$(GIT) tag $(VERSION) main
+gittag___stamp:
+	$(GIT) tag --points-at main | $(GREP) -qx "$(VERSION)" || $(GIT) tag $(VERSION) main
 	$(PRINTF) "%s\n" "$(VERSION)" > $@
 
 version_up___stamp: VERSION
 	if [ -n "$$($(GIT) status -s)" ]; then $(PRINTF) "Error: commit, first.\n"; exit 1; fi
-	$(GIT) tag --points-at main | $(GREP) -qx "$(VERSION)" || while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
+	while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
 	$(GIT) add VERSION
 	$(GIT) commit -m "version up"
 	$(CAT) $< >$@