Commit d3600bb8 authored by Mark Andrews's avatar Mark Andrews
Browse files

4369. [bug] Fix 'make' and 'make install' out-of-tree python

                        support. [RT #42484]
parent da06956f
--- 9.11.0a2 released ---
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()
......
......@@ -59,7 +59,7 @@ install:: ${TARGETS} installdirs
${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
${INSTALL_DATA} ${srcdir}/dnssec-keymgr.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}
......
......@@ -33,8 +33,8 @@ TARGETS = parsetab.py
$(PYTHON) -m compileall .
parsetab.py: policy.py
$(PYTHON) policy.py parse /dev/null > /dev/null
$(PYTHON) -m parsetab
$(PYTHON) ${srcdir}/policy.py parse /dev/null > /dev/null
PYTHONPATH=${srcdir} $(PYTHON) -m parsetab
check test: subdirs
......
......@@ -26,7 +26,7 @@ PYTESTS = dnskey_test.py policy_test.py
check test:
for test in $(PYTESTS); do \
$(PYTHON) $$test; \
PYTHONPATH=${srcdir}/../.. $(PYTHON) ${srcdir}/$$test; \
done
clean distclean::
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment