Index: configure =================================================================== --- configure (revision 23296) +++ configure (working copy) @@ -301,6 +301,7 @@ echo " --with-bindings=LIST install the bindings specified in the" echo " comma-separated list" echo " Supported bindings: perl, python" + echo " --python-exec=PATH Force a specific executable to use" <> $MYTH_CONFIG_MAK echo "LIBDIRNAME=$libdir_name" >> $MYTH_CONFIG_MAK echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK +echo "PYTHON_EXEC=$python_exec" >> $MYTH_CONFIG_MAK <> config.mak echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak @@ -3907,6 +3914,7 @@ echo "SRC_PATH=\"$source_path\"" >> config.mak echo "SRC_PATH_BARE=$source_path" >> config.mak echo "BUILD_ROOT=\"$PWD\"" >> config.mak +echo "PYTHON_EXEC=\"$python_exec\"" >> config.mak echo "CC=$cc" >> config.mak echo "AS=$as" >> config.mak echo "YASM=$yasmexe" >> config.mak Index: bindings/python/python.pro =================================================================== --- bindings/python/python.pro (revision 23432) +++ bindings/python/python.pro (working copy) @@ -2,20 +2,14 @@ python_build.target = python_build python_build.depends = setup.py FORCE -python_build.commands = python setup.py build +python_build.commands = $$PYTHON_EXEC setup.py build python_install.target = python_install python_install.CONFIG = no_path -python_install.commands = python setup.py install --skip-build --root=\"$(if $(INSTALL_ROOT),$(INSTALL_ROOT),/)\" +python_install.commands = $$PYTHON_EXEC setup.py install --skip-build -# This is done so the default /usr/local prefix installs to the "normal" -# /usr/lib/python{VER}/site-packages directory. -!contains(PREFIX, ^/usr(/local)?/?$) { - python_install.commands += --prefix=\"$${PREFIX}\" -} +QMAKE_CLEAN += dummy_file; $$PYTHON_EXEC setup.py clean --all -QMAKE_CLEAN += dummy_file; python setup.py clean --all - PRE_TARGETDEPS += python_build QMAKE_LINK=@-echo QMAKE_EXTRA_UNIX_TARGETS += python_build