diff options
author | Jack Lloyd <[email protected]> | 2017-11-30 11:16:01 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-11-30 11:16:01 -0500 |
commit | 69a519395949a1f816df022e4a09532f3c790166 (patch) | |
tree | 7727517ba937b386c84986246637d2c0f1e0c441 | |
parent | 347d9a86a3c97b59c7c5b8d761f10a8d3a984c0a (diff) |
Remove support for setting install command
Unused since the Python install script was introduced.
-rwxr-xr-x | configure.py | 8 | ||||
-rw-r--r-- | src/build-data/os/solaris.txt | 3 | ||||
-rw-r--r-- | src/build-data/os/windows.txt | 3 | ||||
-rw-r--r-- | src/build-data/os/winphone.txt | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/configure.py b/configure.py index 3ac4c82dd..63038ee80 100755 --- a/configure.py +++ b/configure.py @@ -1325,9 +1325,7 @@ class OsInfo(InfoObject): # pylint: disable=too-many-instance-attributes 'bin_dir': 'bin', 'lib_dir': 'lib', 'doc_dir': 'share/doc', - 'building_shared_supported': 'yes', - 'install_cmd_data': 'install -m 644', - 'install_cmd_exec': 'install -m 755' + 'building_shared_supported': 'yes' }) if lex.ar_command == 'ar' and lex.ar_options == '': @@ -1363,8 +1361,6 @@ class OsInfo(InfoObject): # pylint: disable=too-many-instance-attributes self.building_shared_supported = (True if lex.building_shared_supported == 'yes' else False) self.doc_dir = lex.doc_dir self.header_dir = lex.header_dir - self.install_cmd_data = lex.install_cmd_data - self.install_cmd_exec = lex.install_cmd_exec self.install_root = lex.install_root self.lib_dir = lex.lib_dir self.os_type = lex.os_type @@ -2081,8 +2077,6 @@ def create_template_vars(source_paths, build_config, options, modules, cc, arch, 'python_exe': sys.executable, 'ar_command': options.ar_command or cc.ar_command or osinfo.ar_command, 'ar_options': cc.ar_options or osinfo.ar_options, - 'install_cmd_exec': osinfo.install_cmd_exec, - 'install_cmd_data': osinfo.install_cmd_data, 'lib_prefix': 'lib' if options.os != 'windows' else '', diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt index 4e51f9269..893b7b568 100644 --- a/src/build-data/os/solaris.txt +++ b/src/build-data/os/solaris.txt @@ -2,9 +2,6 @@ os_type unix soname_suffix "so" -install_cmd_data '/usr/ucb/install -m 644' -install_cmd_exec '/usr/ucb/install -m 755' - <target_features> posix_mlock gettimeofday diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt index 2a5e9bd96..daaf3916e 100644 --- a/src/build-data/os/windows.txt +++ b/src/build-data/os/windows.txt @@ -9,9 +9,6 @@ soname_pattern_base "botan.dll" install_root c:\\Botan doc_dir docs -install_cmd_data "copy" -install_cmd_exec "copy" - <target_features> cryptgenrandom gmtime_s diff --git a/src/build-data/os/winphone.txt b/src/build-data/os/winphone.txt index ee43ee702..bedcc9d2c 100644 --- a/src/build-data/os/winphone.txt +++ b/src/build-data/os/winphone.txt @@ -9,9 +9,6 @@ building_shared_supported no install_root c:\\Botan doc_dir docs -install_cmd_data "copy" -install_cmd_exec "copy" - <target_features> crypto_ng gmtime_s |