From: j8takagi <j8takagi@nifty.com>
Date: Tue, 7 Jul 2026 08:48:59 +0000 (+0900)
Subject: Merge branch 'make_git'
X-Git-Tag: v0.6p14~1
X-Git-Url: https://www.j8takagi.net/gitweb?a=commitdiff_plain;h=7258574475dd70152ddf2a5e73339fc4a85517b3;p=yacasl2.git

Merge branch 'make_git'
---

7258574475dd70152ddf2a5e73339fc4a85517b3
diff --cc git.mk
index 8305c3d,c11ac81..1b0da34
--- a/git.mk
+++ b/git.mk
@@@ -5,10 -5,10 +5,6 @@@ GREP := gre
  PRINTF := printf
  SED := sed
  
--# VERSION FORMAT: v<VERSIONNO>p<PATCHNO> (Example: v0.1p0)
--VERSION = $(shell $(CAT) VERSION)
--VERSIONNO = $(shell $(CAT) VERSION | $(SED) 's/v\([0-9]*\.[0-9]*\)p.*$$/\1/' )
--PATCHNO = $(shell $(CAT) VERSION | $(SED) 's/^.*p//' )
  
  gitpush___stamp: gittag___stamp
  	$(GIT) push origin main --tags
@@@ -21,7 -21,7 +17,8 @@@ gittag___stamp: patchup___stam
  
  patchup___stamp:
  	git diff-index --quiet HEAD -- || ($(PRINTF) "Error: commit, first.\n"; exit 1)
- 	$(GIT) tag --points-at HEAD | $(GREP) -qx "$(VERSION)" && exit 0 || while $(GIT) rev-parse -q --verify $(VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >VERSION; done;
 -	$(GIT) tag --points-at HEAD | $(GREP) -qx "$(VERSION)" && exit 0 || while $(GIT) rev-parse -q --verify $$(cat VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >VERSION; done;
++# VERSION FORMAT: v<VERSIONNO>p<PATCHNO> (Example: v0.1p0)
++	$(GIT) tag --points-at HEAD | $(GREP) -qx "$$(cat VERSION)" && exit 0 || while $(GIT) rev-parse -q --verify $$(cat VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $$($(SED) 's/v\([0-9]*\.[0-9]*\)p.*$$/\1/' VERSION) $$($(EXPR) $$($(SED) 's/^.*p//' VERSION)  + 1) >VERSION; done;
  	git diff-index --quiet HEAD -- || $(GIT) commit -a -m "version up to $(VERSION)"
  	$(PRINTF) "%s\n" "$(VERSION)" >$@