4395 [bug] Improve out-of-tree installation of python modules.

[RT #42586]
2016-06-24 12:20:37 +10:00
parent c49e944317
commit 4840ef4581
21 changed files with 55 additions and 17 deletions
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -59,7 +59,13 @@ 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} ${srcdir}/setup.py install --prefix=${DESTDIR}${prefix}
+	if test -n "${PYTHON}" ; then \
+		if test -n "${DESTDIR}" ; then \
+			${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} ; \
+		else \
+			${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} ; \
+		fi \
+	fi

 clean distclean::
 	rm -f ${TARGETS}
--- a/bin/python/isc/Makefile.in
+++ b/bin/python/isc/Makefile.in
@@ -33,7 +33,7 @@ TARGETS =	parsetab.py
 	$(PYTHON) -m compileall .

 parsetab.py: policy.py
-	$(PYTHON) ${srcdir}/policy.py parse /dev/null > /dev/null
+	$(PYTHON) policy.py parse /dev/null > /dev/null
 	PYTHONPATH=${srcdir} $(PYTHON) -m parsetab

 check test: subdirs
--- a/bin/python/isc/init.py.in
+++ b/bin/python/isc/init.py.in
--- a/bin/python/isc/checkds.py.in
+++ b/bin/python/isc/checkds.py.in
--- a/bin/python/isc/coverage.py.in
+++ b/bin/python/isc/coverage.py.in
--- a/bin/python/isc/dnskey.py.in
+++ b/bin/python/isc/dnskey.py.in
--- a/bin/python/isc/eventlist.py.in
+++ b/bin/python/isc/eventlist.py.in
--- a/bin/python/isc/keydict.py.in
+++ b/bin/python/isc/keydict.py.in
--- a/bin/python/isc/keyevent.py.in
+++ b/bin/python/isc/keyevent.py.in
--- a/bin/python/isc/keymgr.py.in
+++ b/bin/python/isc/keymgr.py.in
--- a/bin/python/isc/keyseries.py.in
+++ b/bin/python/isc/keyseries.py.in
--- a/bin/python/isc/keyzone.py.in
+++ b/bin/python/isc/keyzone.py.in
--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
--- a/bin/python/isc/rndc.py.in
+++ b/bin/python/isc/rndc.py.in
--- a/bin/python/isc/tests/dnskey_test.py.in
+++ b/bin/python/isc/tests/dnskey_test.py.in
--- a/bin/python/isc/tests/policy_test.py.in
+++ b/bin/python/isc/tests/policy_test.py.in
--- a/bin/python/setup.py
+++ b/bin/python/setup.py
@@ -20,5 +20,6 @@ setup(name='isc',
      description='Python functions to support BIND utilities',
      url='https://www.isc.org/bind',
      author='Internet Systems Consortium, Inc',
+      author_email='bind9-bugs@isc.org',
      license='ISC',
      packages=['isc'])