From 1bb77d77c01a3ef03cccf6b6784c81970a0dae1f Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 18 Jun 2025 13:06:03 +0000
Subject: slibtoolize: fully support installation of .m4 files to a separate
 location.

---
 project/extras.mk             | 14 +++++++++-----
 src/driver/slbt_amain.c       |  2 +-
 src/logic/slbt_exec_stoolie.c |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/project/extras.mk b/project/extras.mk
index ec30976..c062269 100644
--- a/project/extras.mk
+++ b/project/extras.mk
@@ -4,8 +4,11 @@ CFLAGS_APP_ATTR		+= -DSLBT_APP
 
 CFLAGS_MACHINE		:= -DSLBT_MACHINE=\"$(CC_HOST)\"
 CFLAGS_PKGDATA		:= -DSLBT_PACKAGE_DATADIR=\"$(DATADIR)/$(PACKAGE)\"
+CFLAGS_M4DIR		:= -DSLBT_PACKAGE_M4DIR=\"$(M4_DIR)\"
+
 CFLAGS_CONFIG		+= $(CFLAGS_MACHINE)
 CFLAGS_CONFIG		+= $(CFLAGS_PKGDATA)
+CFLAGS_CONFIG		+= $(CFLAGS_M4DIR)
 CFLAGS_CONFIG		+= $(CFLAGS_ATTR_VISIBILITY_HIDDEN)
 
 src/driver/slbt_driver_ctx.o:	version.tag
@@ -105,13 +108,14 @@ install-app-extras:
 
 install-slibtoolize:
 	mkdir -p $(DESTDIR)$(M4_DIR)
+	mkdir -p $(DESTDIR)$(DATADIR)/$(PACKAGE)
 
 	cp -p $(SOURCE_DIR)/m4/slibtool.m4            $(DESTDIR)$(M4_DIR)
 	cp -p $(SOURCE_DIR)/m4/sltdl.m4               $(DESTDIR)$(M4_DIR)
-	cp -p $(SOURCE_DIR)/aux/ltmain.sh             $(DESTDIR)$(M4_DIR)
-	cp -p $(SOURCE_DIR)/aux/slibtool.sh           $(DESTDIR)$(M4_DIR)
-	cp -p $(SOURCE_DIR)/aux/ar-lib                $(DESTDIR)$(M4_DIR)
-	cp -p $(SOURCE_DIR)/aux/sltdl.h.in            $(DESTDIR)$(M4_DIR)
-	cp -p $(SOURCE_DIR)/aux/sltdl.mk.in           $(DESTDIR)$(M4_DIR)
+	cp -p $(SOURCE_DIR)/aux/ltmain.sh             $(DESTDIR)$(DATADIR)/$(PACKAGE)
+	cp -p $(SOURCE_DIR)/aux/slibtool.sh           $(DESTDIR)$(DATADIR)/$(PACKAGE)
+	cp -p $(SOURCE_DIR)/aux/ar-lib                $(DESTDIR)$(DATADIR)/$(PACKAGE)
+	cp -p $(SOURCE_DIR)/aux/sltdl.h.in            $(DESTDIR)$(DATADIR)/$(PACKAGE)
+	cp -p $(SOURCE_DIR)/aux/sltdl.mk.in           $(DESTDIR)$(DATADIR)/$(PACKAGE)
 
 .PHONY: install-slibtoolize
diff --git a/src/driver/slbt_amain.c b/src/driver/slbt_amain.c
index cf86ad0..a539a16 100644
--- a/src/driver/slbt_amain.c
+++ b/src/driver/slbt_amain.c
@@ -64,7 +64,7 @@ static ssize_t slbt_print_aux_dir(int fdout)
 
 static ssize_t slbt_print_m4_dir(int fdout)
 {
-	return slbt_dprintf(fdout,"%s\n",SLBT_PACKAGE_DATADIR);
+	return slbt_dprintf(fdout,"%s\n",SLBT_PACKAGE_M4DIR);
 }
 
 static ssize_t slbt_print_shared_ext(int fdout, struct slbt_driver_ctx * dctx)
diff --git a/src/logic/slbt_exec_stoolie.c b/src/logic/slbt_exec_stoolie.c
index 0a7c8d1..ccd9e85 100644
--- a/src/logic/slbt_exec_stoolie.c
+++ b/src/logic/slbt_exec_stoolie.c
@@ -112,13 +112,13 @@ static int slbt_exec_stoolie_perform_actions(
 	/* source files */
 	if (slbt_snprintf(
 			slibm4,sizeof(slibm4),"%s/%s",
-			SLBT_PACKAGE_DATADIR,
+			SLBT_PACKAGE_M4DIR,
 			"slibtool.m4") < 0)
 		return SLBT_BUFFER_ERROR(dctx);
 
 	if (slbt_snprintf(
 			sltdl,sizeof(sltdl),"%s/%s",
-			SLBT_PACKAGE_DATADIR,
+			SLBT_PACKAGE_M4DIR,
 			"sltdl.m4") < 0)
 		return SLBT_BUFFER_ERROR(dctx);
 
-- 
cgit v1.2.3