diff --git a/CHANGES b/CHANGES index 0033a48809..547d93876c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4369. [bug] Fix 'make' and 'make install' out-of-tree python + support. [RT #42484] + 4368. [bug] Fix a crash when calling "rndc stats" on some Windows builds because some Visual Studio compilers generated crashing code for the "%z" printf() diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in index 899193d490..0f647e3fea 100644 --- a/bin/python/Makefile.in +++ b/bin/python/Makefile.in @@ -53,7 +53,7 @@ install:: ${TARGETS} installdirs ${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir} ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8 - test -z "${PYTHON}" || ${PYTHON} setup.py install --prefix=${DESTDIR}${prefix} + test -z "${PYTHON}" || ${PYTHON} ${srcdir}/setup.py install --prefix=${DESTDIR}${prefix} clean distclean:: rm -f ${TARGETS} diff --git a/bin/python/isc/tests/Makefile.in b/bin/python/isc/tests/Makefile.in index f865cee792..1fdf3f98e4 100644 --- a/bin/python/isc/tests/Makefile.in +++ b/bin/python/isc/tests/Makefile.in @@ -26,7 +26,7 @@ PYTESTS = dnskey_test.py check test: for test in $(PYTESTS); do \ - $(PYTHON) $$test; \ + PYTHONPATH=${srcdir}/../.. $(PYTHON) ${srcdir}/$$test; \ done clean distclean::