From: Jean-Marc Pigeon <jmp@safe.c>
Date: Fri, 19 Dec 2025 21:28:32 +0000 (-0500)
Subject: First push with mailleur (as a git autonomous)
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=361019d56a806e4bec4fa72ce69ebcafb884baaf;p=jmp%2Fmailleur

First push with mailleur (as a git autonomous)
---

diff --git a/Makefile.dist b/Makefile.dist
index 767b79a..df7e089 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -10,7 +10,7 @@ binary	:  rpm
 		--rebuild					\
 		--define "_topdir $(RPMDIR)" 			\
 		--target `uname -m`				\
-		$(SRPM)/$(APPN)-$(VERSION).$(RELEASE)-*.src.rpm
+		$(SRPM)/$(APPN)-$(DISTVER).$(DISTREL)-*.src.rpm
 	   @ echo "'$(APLV)' RPM binary file, ready"
 
 rpm	: cleanrpm tarfile spec
@@ -84,7 +84,7 @@ spec	: $(APPN).spec.in
 	  @ sed							\
 		-e 's/@@DIST@@/dvl/g'				\
 		-e 's/@@APPN@@/$(APPN)/g'			\
-		-e 's/@@VERSION@@/$(VERSION).$(RELEASE)/g'	\
+		-e 's/@@VERSION@@/$(DISTVER).$(DISTREL)/g'	\
 		-e 's/@@RELEASE@@//g'				\
 		< $< > $@
 
@@ -99,8 +99,8 @@ RPMDIR  =       $(CURDIR)/rpmbuild
 SRC	=	$(RPMDIR)/SOURCES
 SRPM	=	$(RPMDIR)/SRPMS
 #====================================================================
-VERSION	=	$(shell echo `grep VERSION lib/numver.h | cut -d '"' -f2`)
-RELEASE	=	$(shell echo `grep RELEASE lib/numver.h | cut -d '"' -f2`)
-APPV	=	$(VERSION).$(RELEASE)
+DISTVER	=	$(shell echo `grep VERSION lib/numver.h | cut -d '"' -f2`)
+DISTREL	=	$(shell echo `grep RELEASE lib/numver.h | cut -d '"' -f2`)
+APPV	=	$(DISTVER).$(DISTREL)
 APLV	=	$(APPN)-$(APPV)
 #====================================================================
diff --git a/Makefile.git b/Makefile.git
index 2e8a686..1ba7fa3 100644
--- a/Makefile.git
+++ b/Makefile.git
@@ -3,11 +3,19 @@
 #version change
 CURTAG	=	$(shell git rev-parse --abbrev-ref HEAD)
 BRANCH	=	$(shell echo $(CURTAG) | cut -d '-' -f3)
+VERSION	=	$(shell echo $(CURTAG) | cut -d '-' -f2)
 RELEASE	=	$(shell git rev-list --count $(CURTAG) ^tag-$(VERSION))
-VERSION	=	$(shell echo $(CURTAG) | cut -d'-' -f2)
 NEXTREL	=	$(shell echo $(RELEASE) + 1 |bc)
 MAILREL	=	$(shell echo $(VERSION)-$(NEXTREL)-$(BRANCH))
 #--------------------------------------------------------------------
+xxx	:
+	  @ echo $(CURTAG)
+	  @ echo $(BRANCH)
+	  @ echo MA-0.19-dvl |  cut -d '-' -f2
+	  @ echo $(VERSION)
+
+#--------------------------------------------------------------------
+#to check if git find difference
 github	:  
 	   @ (cd pub-mailleur ; git push --tags $@ $(BR):$(BR))
 
@@ -61,7 +69,6 @@ dovers	:
 	       ./www/release.in					\
 	      ) > ./www/release.php
 
-#to check if git find difference
 PUB=mailleurXXXXX
 NEWGIT = $(shell cd mailleur ; git diff --exit-code > /dev/null; echo $$?)
 #--------------------------------------------------------------------