40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 9b6c0817399c4a25a0f246806f9868cf58da1ba3 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Tue, 21 Sep 2021 21:18:36 +0200
|
|
Subject: [PATCH 031/N] msys convert_path fix and root hack
|
|
|
|
---
|
|
Makefile.pre.in | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index e8b8027..057d7f1 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -2291,6 +2291,12 @@ libainstall: all python-config
|
|
else true; \
|
|
fi
|
|
|
|
+ifeq ($(shell uname -o),Msys)
|
|
+DESTDIRFINAL=$(DESTDIR)
|
|
+else
|
|
+DESTDIRFINAL=$(DESTDIR)/
|
|
+endif
|
|
+
|
|
# Install the dynamically loadable modules
|
|
# This goes into $(exec_prefix)
|
|
sharedinstall: all
|
|
@@ -2298,9 +2304,9 @@ sharedinstall: all
|
|
--prefix=$(prefix) \
|
|
--install-scripts=$(BINDIR) \
|
|
--install-platlib=$(DESTSHARED) \
|
|
- --root=$(DESTDIR)/
|
|
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
|
|
- -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
|
|
+ --root=$(DESTDIRFINAL)
|
|
+ -rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
|
|
+ -rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
|
|
|
|
# Here are a couple of targets for MacOSX again, to install a full
|
|
# framework-based Python. frameworkinstall installs everything, the
|