Commit 8ec49a35 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

more build/install fixes;

output generated header files for lib/dns into source tree, not build tree
moved cfgmgr.py to lib/config/python/isc/config
run_bind10.sh now takes python path from build dir, not src


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@698 e5f2f494-b856-4b98-b285-d166d9295462
parent a042fbdc
......@@ -8,7 +8,7 @@ BIND10_PATH=@abs_top_builddir@/src/bin/bind10
PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:$PATH
export PATH
PYTHONPATH=@abs_top_srcdir@/pyshared/
PYTHONPATH=@abs_top_builddir@/pyshared/
export PYTHONPATH
B10_FROM_SOURCE=@abs_top_srcdir@
......
pkglibexecdir = $(libexecdir)/@PACKAGE@
pkglibexec_SCRIPTS = b10-cfgmgr cfgmgr.py
pkglibexec_SCRIPTS = b10-cfgmgr
CLEANFILES = b10-cfgmgr.py
......
......@@ -2,7 +2,7 @@
import sys; sys.path.append ('@@PYTHONPATH@@')
from cfgmgr import ConfigManager
from isc.config.cfgmgr import ConfigManager
import signal
import os
......
PY_MODULES= __init__.py ccsession.py datadefinition.py
PY_MODULES= __init__.py ccsession.py datadefinition.py cfgmgr.py
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/config
......
......@@ -163,7 +163,7 @@ if __name__ == "__main__":
if class_txt == 'generic':
typeandclass.append((type_txt, int(type_code),
(class_txt, 'in'), 1))
rdata_deffile = open('rdataclass.cc', 'w')
rdata_deffile = open('@srcdir@/rdataclass.cc', 'w')
rdata_deffile.write(copyright_txt)
rdata_deffile.write(class_definitions)
rdata_deffile.close()
......@@ -173,7 +173,7 @@ if __name__ == "__main__":
// mode: c++
// End:
'''
rdata_header = open('rdataclass.h', 'w')
rdata_header = open('@srcdir@/rdataclass.h', 'w')
rdata_header.write(copyright_txt)
rdata_header.write(class_declarations)
rdata_header.close()
......@@ -192,7 +192,7 @@ RRType::''' + rrtype + '''()
}\n
'''
rrtype_header_temp = open('@srcdir@/rrtype-placeholder.h', 'r')
rrtype_header_out = open('rrtype.h', 'w')
rrtype_header_out = open('@srcdir@/rrtype.h', 'w')
rrtype_header_out.write(copyright_txt)
for line in rrtype_header_temp.readlines():
rrtype_header_out.write(line)
......@@ -218,7 +218,7 @@ RRClass::''' + rrclass + '''()
'''
rrclass_header_temp = open('@srcdir@/rrclass-placeholder.h', 'r')
rrclass_header_out = open('rrclass.h', 'w')
rrclass_header_out = open('@srcdir@/rrclass.h', 'w')
rrclass_header_out.write(copyright_txt)
for line in rrclass_header_temp.readlines():
rrclass_header_out.write(line)
......@@ -253,7 +253,7 @@ RRClass::''' + rrclass + '''()
typeandclassparams += class_txt + '::' + type_utxt + '>()));\n'
rrparam_temp = open('@srcdir@/rrparamregistry-placeholder.cc', 'r')
rrparam_out = open('rrparamregistry.cc', 'w')
rrparam_out = open('@srcdir@/rrparamregistry.cc', 'w')
rrparam_out.write(copyright_txt)
for line in rrparam_temp.readlines():
rrparam_out.write(line)
......
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