ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[v9_10] Add --with-python-install-dir configure option

Browse Source 
4698.	[port]		Add --with-python-install-dir configure option to allow
			specifying a nonstandard installation directory for
			Python modules. [RT #45407]

(cherry picked from commit a5dc1bc395)
This commit is contained in:
Michał Kępień
2017-08-23 11:50:01 +02:00
parent 3ce7d65f00
commit 25aeff76ad
5 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/python/Makefile.in
View File

@@ -55,9 +55,9 @@ install:: ${TARGETS} installdirs
${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
if test -n "${PYTHON}" ; then \
if test -n "${DESTDIR}" ; then \
${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} ; \
${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
else \
${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} ; \
${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
fi ; \
rm -rf build ; \
fi

7
bin/python/dnssec-checkds.py.in
View File

@@ -20,8 +20,11 @@ import sys
sys.path.insert(0, os.path.dirname(sys.argv[0]))
if os.name != 'nt':
sys.path.insert(1, os.path.join('@prefix@', 'lib',
'python' + sys.version[:3], 'site-packages'))
if '@PYTHON_INSTALL_DIR@': # value of --with-python-install-dir
sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
else:
sys.path.insert(1, os.path.join('@prefix@', 'lib',
'python' + sys.version[:3], 'site-packages'))
import isc.checkds

7
bin/python/dnssec-coverage.py.in
View File

@@ -20,8 +20,11 @@ import sys
sys.path.insert(0, os.path.dirname(sys.argv[0]))
if os.name != 'nt':
sys.path.insert(1, os.path.join('@prefix@', 'lib',
'python' + sys.version[:3], 'site-packages'))
if '@PYTHON_INSTALL_DIR@': # value of --with-python-install-dir
sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
else:
sys.path.insert(1, os.path.join('@prefix@', 'lib',
'python' + sys.version[:3], 'site-packages'))
import isc.coverage