Makefileの修正

diff --git a/Makefile b/Makefile
index f01859e2b170fb722c6b6498fbef05802dbf9226..30ca78e9b8f635de03b170542fc53ce19fc2b896 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,19 +87,6 @@ version: $(VERSIONFILES)
 $(VERSIONFILES): VERSION
        @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
-gittag:
-       if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MAINGITREF)"; then $(GIT) tag $(VERSION); fi
-
-gitpush: gitpushorigin gitpushgithub
-
-gitpushorigin:
-       $(GIT) push origin main
-       $(GIT) push origin $(VERSION)
-
-gitpushgithub:
-       $(GIT) push github main
-       $(GIT) push github $(VERSION)
-
 copyright: LICENSE.copyright___stamp  README.copyright___stamp
 
 %.copyright___stamp: %

diff --git a/git.mk b/git.mk
index ec7252a31d891aa41ea4f5ba6a4fc6edf15955cd..2e9d8f89e2b7b5d904fdc7a2dc323511b93afc0f 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -25,7 +25,7 @@ commit___stamp: version_up___stamp
 
 version_up___stamp: VERSION
        if [ -n "$$($(GIT) status -s)" ]; then $(PRINTF) "Error: commit, first.\n"; exit 1; fi
-       while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "DEBUG - ver: %s; patch:%s;\n" $(VERSIONNO) $(PATCHNO); $(PRINTF) "v%sp%s\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
+       while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%sp%s\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
        $(CAT) $< >$@
 
 gitclean: