diff options
Diffstat (limited to 'build/generator/gen_make.py')
| -rw-r--r-- | build/generator/gen_make.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build/generator/gen_make.py b/build/generator/gen_make.py index df9677c..bdb5d00 100644 --- a/build/generator/gen_make.py +++ b/build/generator/gen_make.py @@ -309,6 +309,8 @@ class Generator(gen_base.GeneratorBase): ezt_target.link_cmd = target_ob.link_cmd if hasattr(target_ob, 'output_dir'): ezt_target.output_dir = target_ob.output_dir + if hasattr(target_ob, 'headers_dir'): + ezt_target.headers_dir = target_ob.headers_dir # Add additional install dependencies if necessary if target_ob.add_install_deps: @@ -443,7 +445,7 @@ class Generator(gen_base.GeneratorBase): ### we should turn AREA into an object, then test it instead of this if area[:5] == 'swig-' and area[-4:] != '-lib' \ or area[:7] == 'javahl-' \ - or area[:6] == 'cxxhl-' \ + or area[:6] == 'svnxx-' \ or area == 'tools': ezt_area.extra_install = 'yes' @@ -631,9 +633,10 @@ DIR=`pwd` lib_deps=[], lib_required=[], lib_required_private=[], + version=self.version, ) - # libsvn_foo -> -lsvn_foo - data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1)) + # libsvn_foo -> -lsvn_foo-1 + data.lib_deps.append('-l%s-%s' % (lib_name.replace('lib', '', 1), data.version)) for lib_dep in lib_deps.split(): if lib_dep == 'apriconv': # apriconv is part of apr-util, skip it |