make gittagの修正

diff --git a/Makefile b/Makefile
index 966c2d7ed698b5221cb36ce8fe6be43e1e708b50..4d23a63797a11c7fd8a5b12c132b9aee7c31f85c 100644 (file)
--- 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 b1c33787e28825941a7a06ac0004bcb67f3225ed..808528c58d14f43d7225ca4728b661ff80f649da 100644 (file)
--- 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) $< >$@