diff options
| author | lloyd <[email protected]> | 2015-01-07 11:47:09 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-01-07 11:47:09 +0000 |
| commit | 0c5301a6dde28b22257415c74e0d1491228fafb6 (patch) | |
| tree | bec7b4f06b39134b72407617304355d2fc34fe71 /src | |
| parent | 1fe84e0451a6a37783a67bf191c0cdec70c86baf (diff) | |
The pkgconfig file should be installed relative to the library dir
rather than the base destdir. Pointed out by hexchain in github pull 38.
Version the docdir with the full version incl patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/makefile/header.in | 8 | ||||
| -rwxr-xr-x | src/scripts/install.py | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index 970f75da4..d01b8a28a 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -24,14 +24,6 @@ BRANCH = %{version_major}.%{version_minor} LIBNAME = %{lib_prefix}botan-%{version_major}.%{version_minor} -# Installation Settings -DESTDIR = %{destdir} -BINDIR = $(DESTDIR)/bin -LIBDIR = $(DESTDIR)/%{libdir} -HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(BRANCH)/botan -DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) -PKGCONF_DIR = $(LIBDIR)/pkgconfig - # Executable targets APP = %{out_dir}/botan%{program_suffix} TEST = %{out_dir}/botan-test%{program_suffix} diff --git a/src/scripts/install.py b/src/scripts/install.py index daa4a928e..5b6be7ce4 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -18,7 +18,7 @@ import sys if 'dont_write_bytecode' in sys.__dict__: sys.dont_write_bytecode = True -from botan_version import release_major, release_minor +from botan_version import release_major, release_minor, release_patch import combine_relnotes def parse_command_line(args): @@ -52,9 +52,9 @@ def parse_command_line(args): install_group.add_option('--versioned-include-dir', metavar='SUFFIX_DIR', default='botan-%d.%d' % (release_major, release_minor), help='Name of versioned include dir') - install_group.add_option('--doc-dir-suffix', metavar='SUFFIX', - default='-%d.%d' % (release_major, release_minor), - help='Set optional suffix on doc dir (default %default)') + install_group.add_option('--doc-dir-suffix', metavar='V', + default='-%d.%d.%d' % (release_major, release_minor, release_patch), + help='Set optional suffix on doc dir (default \'%default\')') install_group.add_option('--umask', metavar='MASK', default='022', help='Umask to set (default %default)') @@ -194,7 +194,7 @@ def main(args = None): os.path.join(bin_dir, os.path.basename(build_vars['botan_config']))) if 'botan_pkgconfig' in build_vars: - pkgconfig_dir = os.path.join(options.destdir, options.pkgconfigdir) + pkgconfig_dir = os.path.join(options.destdir, options.libdir, options.pkgconfigdir) makedirs(pkgconfig_dir) shutil.copyfile(build_vars['botan_pkgconfig'], os.path.join(pkgconfig_dir, os.path.basename(build_vars['botan_pkgconfig']))) |