diff options
author | Jack Lloyd <[email protected]> | 2017-11-16 21:01:48 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-11-16 21:03:43 -0500 |
commit | 198cd0dda6d0944244b6166bc7aabb8d8268a683 (patch) | |
tree | 8642138ac6f1dd4fa96c91918840085bb0a34196 /src | |
parent | d1954b4702694f0d95e29fabde6c9d88b379e29c (diff) |
Prefix execution of install.py with Python binary
Fixes GH #1297
This is done even on GNU make builds, since the same issue
affects MinGW
Diffstat (limited to 'src')
-rw-r--r-- | src/build-data/makefile/gmake.in | 2 | ||||
-rw-r--r-- | src/build-data/makefile/header.in | 2 | ||||
-rw-r--r-- | src/build-data/makefile/nmake.in | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index 70b534503..a943392ba 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -79,4 +79,4 @@ docs: %{build_doc_commands} install: $(CLI) docs - $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} + $(PYTHON_EXE) $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index a63a83f3a..6757abbad 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -2,6 +2,8 @@ CXX = %{cxx} %{cxx_abi_flags} LINKER = %{linker} +PYTHON_EXE = %{python_exe} + CXXFLAGS = %{cc_compile_flags} WARN_FLAGS = %{cc_warning_flags} SO_OBJ_FLAGS = %{shared_flags} diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index f5ecde341..b721ffd67 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -102,4 +102,4 @@ distclean: clean $(RM) Makefile $(LIB_BASENAME).* $(CLI).* install: $(CLI) docs - $(SCRIPTS_DIR)\install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} + $(PYTHON_EXE) $(SCRIPTS_DIR)\install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} |