diff options
author | Jack Lloyd <[email protected]> | 2017-12-03 13:22:21 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-12-03 13:22:21 -0500 |
commit | 2bd958a68e7e9651c12996caddf049a4dc747212 (patch) | |
tree | 07d293cb1e89a246924b4766354cdd8f6c6e190f /configure.py | |
parent | fccea4e003906d7dd0c44b91415b4651220d74b9 (diff) |
Simplify pkg-config file generation
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.py b/configure.py index 53001b856..12b9aaeb0 100755 --- a/configure.py +++ b/configure.py @@ -262,8 +262,6 @@ class BuildPaths(object): # pylint: disable=too-many-instance-attributes raise InternalError("Unknown src info type '%s'" % (typ)) -PKG_CONFIG_FILENAME = 'botan-%d.pc' % (Version.major()) - def make_build_doc_commands(source_paths, build_paths, options): if options.with_documentation is False: @@ -2141,7 +2139,7 @@ def create_template_vars(source_paths, build_config, options, modules, cc, arch, } if options.os != 'windows': - variables['botan_pkgconfig'] = os.path.join(build_config.build_dir, PKG_CONFIG_FILENAME) + variables['botan_pkgconfig'] = os.path.join(build_config.build_dir, 'botan-%d.pc' % (Version.major())) # The name is always set because Windows build needs it variables['static_lib_name'] = '%s%s.%s' % (variables['lib_prefix'], variables['libname'], @@ -3164,8 +3162,8 @@ def main_action_configure_build(info_modules, source_paths, options, write_template(in_build_dir('build.h'), in_build_data('buildh.in')) write_template(in_build_dir('botan.doxy'), in_build_data('botan.doxy.in')) - if options.os != 'windows': - write_template(in_build_dir(PKG_CONFIG_FILENAME), in_build_data('botan.pc.in')) + if 'botan_pkgconfig' in template_vars: + write_template(template_vars['botan_pkgconfig'], in_build_data('botan.pc.in')) if options.os == 'windows': write_template(in_build_dir('botan.iss'), in_build_data('innosetup.in')) |