From 57c5e32791fa21ebb468f0dbe7125d73f7cead10 Mon Sep 17 00:00:00 2001
From: Marc Mezzarobba <marc@mezzarobba.net>
Date: Mon, 13 Nov 2023 10:23:54 +0100
Subject: [PATCH] Makefile.in: fix handling of $DESTDIR

Change the definition of $BINDIR & co so that, in the case of staged
installations, they contain the final (binary) installation directory,
not the packaging directory.

The only tangible effect should be that, on MacOS, install_name_tool is
passed the correct library path. See

https://github.com/sagemath/sage/pull/35848#issuecomment-1807294889
---
 Makefile.in | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 08db6837c9..2827b9da14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,9 +34,9 @@ FLINT_SOLIB:=@FLINT_SOLIB@
 prefix:=@prefix@
 exec_prefix:=@exec_prefix@
 
-INCLUDEDIR:=$(DESTDIR)@includedir@
-LIBDIR:=$(DESTDIR)@libdir@
-BINDIR:=$(DESTDIR)@bindir@
+INCLUDEDIR:=@includedir@
+LIBDIR:=@libdir@
+BINDIR:=@bindir@
 PKGCONFIGDIR:=$(LIBDIR)/pkgconfig
 
 HOST_OS:=@host_os@
@@ -202,10 +202,10 @@ BUILD_DIRS +=                                                               \
 endif
 
 INSTALL_DIRS :=                                                             \
-        $(LIBDIR)                       $(INCLUDEDIR)/flint                 \
-        $(PKGCONFIGDIR)
+        $(DESTDIR)$(LIBDIR)             $(DESTDIR)$(INCLUDEDIR)/flint       \
+        $(DESTDIR)$(PKGCONFIGDIR)
 ifneq ($(FLINT_DLLLIB),0)
-INSTALL_DIRS += $(BINDIR)
+INSTALL_DIRS += $(DESTDIR)$(BINDIR)
 endif
 
 ################################################################################
@@ -722,41 +722,41 @@ distclean: clean
 ################################################################################
 
 install: library | $(INSTALL_DIRS)
-	$(CP) flint.pc $(PKGCONFIGDIR)/flint.pc
+	$(CP) flint.pc $(DESTDIR)$(PKGCONFIGDIR)/flint.pc
 ifneq ($(SHARED), 0)
 ifneq ($(FLINT_DLLLIB),0)
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(BINDIR)
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(BINDIR)
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BINDIR)
-	$(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(LIBDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(BINDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(BINDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(BINDIR)
+	$(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(DESTDIR)$(LIBDIR)
 else
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(LIBDIR)
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(LIBDIR)
-	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(LIBDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(LIBDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(LIBDIR)
+	$(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR)
 endif
 ifneq ($(FLINT_DYLIB),0)
-	install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(LIBDIR)/$(FLINT_LIB)
+	install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB)
 endif
 endif
 ifneq ($(STATIC), 0)
-	$(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(LIBDIR)
+	$(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(DESTDIR)$(LIBDIR)
 endif
-	$(CP) $(HEADERS) $(INCLUDEDIR)/flint
+	$(CP) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/flint
 
 uninstall:
-	$(RM_F) $(PKGCONFIGDIR)/flint.pc
+	$(RM_F) $(DESTDIR)$(PKGCONFIGDIR)/flint.pc
 ifneq ($(FLINT_DLLLIB),0)
-	$(RM_F) $(BINDIR)/$(FLINT_LIB)
-	$(RM_F) $(BINDIR)/$(FLINT_LIB_MAJOR)
-	$(RM_F) $(BINDIR)/$(FLINT_LIB_FULL)
-	$(RM_F) $(LIBDIR)/$(FLINT_IMPLIB)
+	$(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB)
+	$(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_MAJOR)
+	$(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_FULL)
+	$(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_IMPLIB)
 else
-	$(RM_F) $(LIBDIR)/$(FLINT_LIB)
-	$(RM_F) $(LIBDIR)/$(FLINT_LIB_MAJOR)
-	$(RM_F) $(LIBDIR)/$(FLINT_LIB_FULL)
+	$(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB)
+	$(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_MAJOR)
+	$(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_FULL)
 endif
-	$(RM_F) $(LIBDIR)/$(FLINT_LIB_STATIC)
-	$(RM_RF) $(INCLUDEDIR)/flint
+	$(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_STATIC)
+	$(RM_RF) $(DESTDIR)$(INCLUDEDIR)/flint
 
 ################################################################################
 # maintainer stuff