diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/config/makefile/nmake.in | 4 | ||||
| -rw-r--r-- | misc/config/makefile/unix.in | 2 | ||||
| -rw-r--r-- | misc/config/makefile/unix_shr.in | 2 | ||||
| -rw-r--r-- | misc/config/os/defaults | 3 | ||||
| -rw-r--r-- | misc/config/os/solaris | 3 | ||||
| -rw-r--r-- | misc/config/os/windows | 6 |
6 files changed, 12 insertions, 8 deletions
diff --git a/misc/config/makefile/nmake.in b/misc/config/makefile/nmake.in index 236d42784..01d1fd07a 100644 --- a/misc/config/makefile/nmake.in +++ b/misc/config/makefile/nmake.in @@ -33,8 +33,8 @@ DOCDIR = $(INSTALLROOT)\@{var:docdir}\Botan-$(VERSION) AR = @{var:ar_command} CD = @cd ECHO = @echo -INSTALL = copy -INSTALL_CMD = $(INSTALL) +INSTALL = @{var:install_cmd_exec} +INSTALL_CMD = @{var:install_cmd_exec} MKDIR = @md MKDIR_INSTALL = @md RM = @del /Q diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in index 9f83c0970..f5d83c81a 100644 --- a/misc/config/makefile/unix.in +++ b/misc/config/makefile/unix.in @@ -30,8 +30,6 @@ DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) OWNER = @{var:install_user} GROUP = @{var:install_group} -DATA_MODE = 644 -EXEC_MODE = 755 CONFIG_SCRIPT = botan-config diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in index 30cf70538..24a77707e 100644 --- a/misc/config/makefile/unix_shr.in +++ b/misc/config/makefile/unix_shr.in @@ -32,8 +32,6 @@ DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) OWNER = @{var:install_user} GROUP = @{var:install_group} -DATA_MODE = 644 -EXEC_MODE = 755 CONFIG_SCRIPT = botan-config diff --git a/misc/config/os/defaults b/misc/config/os/defaults index 0fb27967a..a22821e56 100644 --- a/misc/config/os/defaults +++ b/misc/config/os/defaults @@ -17,4 +17,5 @@ doc_dir share/doc install_user root install_group root -install_cmd install -o OWNER -g GROUP -m MODE +install_cmd_data install -o OWNER -g GROUP -m 644 +install_cmd_exec install -o OWNER -g GROUP -m 755 diff --git a/misc/config/os/solaris b/misc/config/os/solaris index e0af2abbf..078019584 100644 --- a/misc/config/os/solaris +++ b/misc/config/os/solaris @@ -2,7 +2,8 @@ realname "Solaris" os_type unix -install_cmd install -u OWNER -g GROUP -m MODE +install_cmd_data install -u OWNER -g GROUP -m 644 +install_cmd_exec install -u OWNER -g GROUP -m 755 <supports_shared> all diff --git a/misc/config/os/windows b/misc/config/os/windows index 460c1361e..44b2a102b 100644 --- a/misc/config/os/windows +++ b/misc/config/os/windows @@ -9,6 +9,12 @@ static_suffix lib install_root c:\Botan doc_dir docs +install_cmd_data copy +install_cmd_exec copy + +install_user <nil> +install_group <nil> + <supports_shared> #all </supports_shared> |