Skip to content

Commit a381e9f

Browse files
committed
msys convert_path fix and root hack
1 parent 42490eb commit a381e9f

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
@@ -2276,16 +2276,22 @@ libainstall: all python-config
22762276
else true; \
22772277
fi
22782278

2279+
ifeq ($(shell uname -o),Msys)
2280+
DESTDIRFINAL=$(DESTDIR)
2281+
else
2282+
DESTDIRFINAL=$(DESTDIR)/
2283+
endif
2284+
22792285
# Install the dynamically loadable modules
22802286
# This goes into $(exec_prefix)
22812287
sharedinstall: all
22822288
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
22832289
--prefix=$(prefix) \
22842290
--install-scripts=$(BINDIR) \
22852291
--install-platlib=$(DESTSHARED) \
2286-
--root=$(DESTDIR)/
2287-
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
2288-
-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
2292+
--root=$(DESTDIRFINAL)
2293+
-rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
2294+
-rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
22892295

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

0 commit comments

Comments
 (0)