diff options
| author | Jack Lloyd <[email protected]> | 2019-09-26 10:35:12 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-09-26 10:35:12 -0400 |
| commit | 992726edfd5a6b41848514ba549a067524ef9a0b (patch) | |
| tree | 50bbf0f2b2e1b3bd6ac2cc21ed7ce2da2767dce6 /src | |
| parent | 50e1552e49aeef26614c8f5317aa7b0f33272219 (diff) | |
| parent | da87c913f9bbaea758ae9f8f4e58ae615900e583 (diff) | |
Merge GH #2109 Handle absolute path libdir/bindir options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/botan.pc.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile.in | 2 | ||||
| -rwxr-xr-x | src/scripts/install.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in index e3c46eb5e..7139436f9 100644 --- a/src/build-data/botan.pc.in +++ b/src/build-data/botan.pc.in @@ -1,6 +1,6 @@ prefix=%{prefix} exec_prefix=${prefix} -libdir=${prefix}/%{libdir} +libdir=%{libdir} includedir=${prefix}/include/botan-%{version_major} Name: Botan diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in index 242c7b95f..a936c06d8 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in @@ -27,7 +27,7 @@ EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) SCRIPTS_DIR = %{scripts_dir} -INSTALLED_LIB_DIR = %{prefix}/%{libdir} +INSTALLED_LIB_DIR = %{libdir} # The primary target all: %{all_targets} diff --git a/src/scripts/install.py b/src/scripts/install.py index b57fb19af..68256423f 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -156,8 +156,8 @@ def main(args): build_static_lib = bool(cfg['build_static_lib']) out_dir = cfg['out_dir'] - bin_dir = os.path.join(options.prefix, options.bindir) - lib_dir = os.path.join(options.prefix, options.libdir) + bin_dir = options.bindir + lib_dir = options.libdir target_include_dir = os.path.join(options.prefix, options.includedir, 'botan-%d' % (ver_major), |