From ff16ac4c87d94ac1ccb3f41680cfbe137870d9c9 Mon Sep 17 00:00:00 2001
From: Milan Bouchet-Valat <nalimilan@club.fr>
Date: Sun, 17 Dec 2023 22:34:07 +0100
Subject: [PATCH 1/2] Support `libdir` and `includedir` variables

These are the standard GNU make variables that distributions expect
to be able to set
(https://www.gnu.org/prep/standards/html_node/Directory-Variables.html).
Since Julia supports the same variables and passes them during the build,
this ensures that libblastrampoline.so is installed to the right directory
(in particular to usr/lib64 where appropriate).
---
 src/Make.inc |  3 +++
 src/Makefile | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Make.inc b/src/Make.inc
index 782cfc3..9ab6db6 100644
--- a/src/Make.inc
+++ b/src/Make.inc
@@ -118,6 +118,9 @@ endif
 prefix ?= prefix
 builddir ?= build
 
+libdir := $(prefix)/$(binlib)
+includedir := $(prefix)/include
+
 define newline # a literal \n
 
 
diff --git a/src/Makefile b/src/Makefile
index ea3e0d3..daf8530 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -73,12 +73,12 @@ endif
 
 # Install both libraries and our headers
 install: $(TARGET_LIBRARIES)
-	@mkdir -p $(DESTDIR)$(prefix)/include/libblastrampoline
-	-@cp -Ra $(LBT_ROOT)/include/* $(DESTDIR)$(prefix)/include/libblastrampoline
-	@cp -a $(LBT_ROOT)/src/libblastrampoline.h $(DESTDIR)$(prefix)/include/
-	@mkdir -p $(DESTDIR)$(prefix)/$(binlib)
+	@mkdir -p $(DESTDIR)/$(includedir)/libblastrampoline
+	-@cp -Ra $(LBT_ROOT)/include/* $(DESTDIR)/$(includedir)/libblastrampoline
+	@cp -a $(LBT_ROOT)/src/libblastrampoline.h $(DESTDIR)/$(includedir)/
+	@mkdir -p $(DESTDIR)/$(libdir)
 	@for lib in $(TARGET_LIBRARIES); do \
-		cp -a $${lib} $(DESTDIR)$(prefix)/$(binlib)/; \
+		cp -a $${lib} $(DESTDIR)/$(libdir)/; \
 	done
 ifeq ($(OS),WINNT)
 	@mkdir -p $(DESTDIR)$(prefix)/lib

From 90bee5f8cb38a2690eec4a53e817fa43783be2f4 Mon Sep 17 00:00:00 2001
From: Milan Bouchet-Valat <nalimilan@club.fr>
Date: Sun, 17 Dec 2023 23:06:37 +0100
Subject: [PATCH 2/2] Try to fix failures on Windows

---
 src/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index daf8530..384a17a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -73,12 +73,12 @@ endif
 
 # Install both libraries and our headers
 install: $(TARGET_LIBRARIES)
-	@mkdir -p $(DESTDIR)/$(includedir)/libblastrampoline
-	-@cp -Ra $(LBT_ROOT)/include/* $(DESTDIR)/$(includedir)/libblastrampoline
-	@cp -a $(LBT_ROOT)/src/libblastrampoline.h $(DESTDIR)/$(includedir)/
-	@mkdir -p $(DESTDIR)/$(libdir)
+	@mkdir -p $(DESTDIR)$(includedir)/libblastrampoline
+	-@cp -Ra $(LBT_ROOT)/include/* $(DESTDIR)$(includedir)/libblastrampoline
+	@cp -a $(LBT_ROOT)/src/libblastrampoline.h $(DESTDIR)$(includedir)/
+	@mkdir -p $(DESTDIR)$(libdir)
 	@for lib in $(TARGET_LIBRARIES); do \
-		cp -a $${lib} $(DESTDIR)/$(libdir)/; \
+		cp -a $${lib} $(DESTDIR)$(libdir)/; \
 	done
 ifeq ($(OS),WINNT)
 	@mkdir -p $(DESTDIR)$(prefix)/lib