From 22fc2593de88d46a11786898d401e4801faeb125 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/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 e0b8155..cf16e93 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1707,6 +1707,12 @@ libainstall: @DEF_MAKE_RULE@ 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: sharedmods @@ -1714,9 +1720,9 @@ sharedinstall: sharedmods --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 -- 2.33.0