Skip to content

Commit 08044df

Browse files
committed
msys convert_path fix and root hack
1 parent 7a53676 commit 08044df

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Makefile.pre.in

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,16 +2281,22 @@ libainstall: all python-config
22812281
else true; \
22822282
fi
22832283

2284+
ifeq ($(shell uname -o),Msys)
2285+
DESTDIRFINAL=$(DESTDIR)
2286+
else
2287+
DESTDIRFINAL=$(DESTDIR)/
2288+
endif
2289+
22842290
# Install the dynamically loadable modules
22852291
# This goes into $(exec_prefix)
22862292
sharedinstall: all
22872293
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
22882294
--prefix=$(prefix) \
22892295
--install-scripts=$(BINDIR) \
22902296
--install-platlib=$(DESTSHARED) \
2291-
--root=$(DESTDIR)/
2292-
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
2293-
-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
2297+
--root=$(DESTDIRFINAL)
2298+
-rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
2299+
-rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
22942300

22952301
# Here are a couple of targets for MacOSX again, to install a full
22962302
# framework-based Python. frameworkinstall installs everything, the

0 commit comments

Comments
 (0)