diff options
| author | 刘群 <[email protected]> | 2019-09-21 20:24:43 +0800 |
|---|---|---|
| committer | 刘群 <[email protected]> | 2019-09-21 21:01:22 +0800 |
| commit | 638a3344fec4f3176ec52c38594efcc1e8dcdfbd (patch) | |
| tree | c5d61f30e09ca4e10121cdea58acaff2a99ba4b9 /src | |
| parent | bdd706a90907521a4ad924999dbfe75598157091 (diff) | |
support full-path styled --libdir and --bindir options
Changed files:
- configure.py
- src/scripts/install.py
- src/build-data/makefile.in
Signed-off-by: Liu Qun <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/makefile.in | 2 | ||||
| -rwxr-xr-x | src/scripts/install.py | 4 |
2 files changed, 3 insertions, 3 deletions
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), |