diff options
| author | Jack Lloyd <[email protected]> | 2019-10-10 19:34:34 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-10-10 19:34:34 -0400 |
| commit | d287c7567b5f65c9d21957d23bd324dcc4649b89 (patch) | |
| tree | 5d0be099262d628ef095e5f80ed8622020a194bc /src | |
| parent | 4add9778f68f7c5832f61124870c1fdbb09c4997 (diff) | |
| parent | 34f6e5266b3713965d8a2bdbada5fae18d3833f5 (diff) | |
Merge GH #2140 Avoid make install trying to build unwanted targets
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/makefile.in | 2 | ||||
| -rwxr-xr-x | src/scripts/install.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in index a936c06d8..76e054378 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in @@ -57,7 +57,7 @@ clean: distclean: $(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}" --distclean -install: libs cli docs +install: %{install_targets} $(PYTHON_EXE) $(SCRIPTS_DIR)/install.py --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} # Object Files diff --git a/src/scripts/install.py b/src/scripts/install.py index 68256423f..4cbce5a8e 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -154,6 +154,7 @@ def main(args): target_os = cfg['os'] build_shared_lib = bool(cfg['build_shared_lib']) build_static_lib = bool(cfg['build_static_lib']) + build_cli = bool(cfg['build_cli_exe']) out_dir = cfg['out_dir'] bin_dir = options.bindir @@ -208,14 +209,15 @@ def main(args): finally: os.chdir(prev_cwd) - copy_executable(cfg['cli_exe'], prepend_destdir(os.path.join(bin_dir, cfg['cli_exe_name']))) + if build_cli: + copy_executable(cfg['cli_exe'], prepend_destdir(os.path.join(bin_dir, cfg['cli_exe_name']))) # On MacOS, if we are using shared libraries and we install, we should fix # up the library name, otherwise the botan command won't work; ironically # we only need to do this because we previously changed it from a setting # that would be correct for installation to one that lets us run it from # the build directory - if target_os == 'macos' and build_shared_lib: + if target_os == 'macos' and build_shared_lib and build_cli: soname_abi = cfg['soname_abi'] subprocess.check_call(['install_name_tool', |