From c141f2c5fb1c2d81c45fa55ab366d019d300eb65 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Fri, 12 Jun 2026 14:52:27 +0900
Subject: [PATCH] =?utf8?q?git.mk=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 git.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git.mk b/git.mk
index 51c6007..ec7252a 100644
--- a/git.mk
+++ b/git.mk
@@ -6,7 +6,7 @@ SED := sed
 
 # VERSION FORMAT: v<VERSIONNO>p<PATCHNO> (Example: v0.1p00)
 VERSION = $(shell $(CAT) VERSION)
-VERSIONNO = $(shell $(CAT) VERSION | $(SED) 's/p.*$$//' )
+VERSIONNO = $(shell $(CAT) VERSION | $(SED) 's/v\([0-9]*\.[0-9]*\)p.*$$/\1/' )
 PATCHNO = $(shell $(CAT) VERSION | $(SED) 's/^.*p//' )
 
 gitpush___stamp: gittag___stamp
@@ -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 $(VERSION) >/dev/null 2>&1; do $(PRINTF) "v%sp%s\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
+	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
 	$(CAT) $< >$@
 
 gitclean:
-- 
2.47.3