From 09dfe8c60a5117605871ed1687453d882503ab28 Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Mon, 16 Jun 2025 14:13:28 -0400
Subject: [PATCH] TRying to install sorter shell script within binary rpm

---
 Makefile         | 10 +++++-----
 Makefile.dist    |  4 ++++
 mailleur.spec.in |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index eac7a62..02f2642 100644
--- a/Makefile
+++ b/Makefile
@@ -173,17 +173,17 @@ deltest	:
 install	:
 	   @ # Creating all needed system directory
 	   @ install -d $(DESTDIR)/$(SBINDIR)/
-	   @ install -d $(DESTDIR)/$(DATADIR)/$(APPN)
+	   @ install -d $(DESTDIR)/$(DATADIR)/$(APPN)/
 	   @ install -d $(DESTDIR)/$(ETCDIR)/$(APPN)/
 	   @ cp -a					\
 		bin/*					\
 	   	$(DESTDIR)/$(SBINDIR)/
-	   @ cp -a					\
-		linux
-	   	$(DESTDIR)/$(DATADIR)/$(APPN)
 	   @ cp -a					\
 		conf/$(APPN).conf			\
 	   	$(DESTDIR)/$(ETCDIR)/$(APPN)
+	   @ cp -a					\
+		linux					\
+	   	$(DESTDIR)/$(DATADIR)/$(APPN)/
 
 #--------------------------------------------------------------------
 SUBDIR	= 						\
@@ -195,7 +195,7 @@ SUBDIR	= 						\
 APPNAME	=  mailleur
 #--------------------------------------------------------------------
 #Managing testarea
-DATDIR	= usr/share
+DATADIR	= usr/share
 SBINDIR = /usr/sbin
 ETCDIR	= /etc
 CURDIR  = $(shell pwd)
diff --git a/Makefile.dist b/Makefile.dist
index 17d50e3..c6bdbed 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,6 +5,7 @@ APPN	=	mailleur
 binary	: rpm
 	  @ echo "'$(APLV)' RPM binary file, building"
 	  @ rpmbuild						\
+		--noclean					\
 		--quiet						\
 		--rebuild					\
 		--define "_topdir $(RPMDIR)" 			\
@@ -31,15 +32,18 @@ tarfile	: clean
 		$(APLV)/conf					\
 		$(APLV)/bin					\
 		$(APLV)/lib					\
+		$(APLV)/linux					\
 		$(APLV)
 	  @ date > $(APLV)/$(APLV).build_date
 	  @ cp -a Makefile*     $(APLV)/
 	  @ cp -a app/*.c	$(APLV)/app/
 	  @ cp -a conf/*.conf	$(APLV)/conf/
 	  @ cp -a lib/{*.c,*.h} $(APLV)/lib/
+	  @ cp -a linux/*	$(APLV)/linux/
 	  @ cp -a app/Makefile  $(APLV)/app/Makefile
 	  @ cp -a lib/Makefile  $(APLV)/lib/Makefile
 	  @ tar zcf $(SRC)/$(APLV).tar.gz $(APLV)
+	  @ rm -fr $(APLV)
 	  @ echo "'$(APLV)' tar file, ready"
 	  
 spec	: $(APPN).spec.in
diff --git a/mailleur.spec.in b/mailleur.spec.in
index 597bd9e..d8a3836 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -24,8 +24,7 @@ search about email exchange within time and transaction context.
 %files			
 %defattr(-,root,root,-)
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/*
-%attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/%{name}
-%attr(0755,root,root) %{_datadir}/%{name}/linux/sysv/%{name}
+%attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
 %{_sbindir}/chkspf
 %{_sbindir}/receiver
 %{_sbindir}/sender
-- 
2.47.3