From: Mark Andrews <marka@isc.org>
Date: Mon, 23 May 2016 23:50:23 +0000 (+1000)
Subject: 4369.   [bug]           Fix 'make' and 'make install' out-of-tree python
X-Git-Tag: v9.11.0a2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3600bb89d32a7e0d943691d3cad5c569ef6158d;p=thirdparty%2Fbind9.git

4369.   [bug]           Fix 'make' and 'make install' out-of-tree python
                        support. [RT #42484]
---

diff --git a/CHANGES b/CHANGES
index 4618d90ae67..769e35c913c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 	--- 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()
diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index 3920a8072a2..085b3485cd1 100644
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -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}
diff --git a/bin/python/isc/Makefile.in b/bin/python/isc/Makefile.in
index 04953990a00..80fa0ce5761 100644
--- a/bin/python/isc/Makefile.in
+++ b/bin/python/isc/Makefile.in
@@ -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
 
diff --git a/bin/python/isc/tests/Makefile.in b/bin/python/isc/tests/Makefile.in
index baca4ff25b5..0b4b511fe51 100644
--- a/bin/python/isc/tests/Makefile.in
+++ b/bin/python/isc/tests/Makefile.in
@@ -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::