aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-08-17 11:11:01 -0400
committerJack Lloyd <[email protected]>2016-08-17 11:11:01 -0400
commitb13da1c251bf4ecc6f175d62e0cea32894bcabd1 (patch)
treec2ea384f95b5ef78cd9a11b209b2b0c26f72a6ea /src
parent50a88e05692b83aee3828d92d8101a97e3d0b2fc (diff)
parent73a6416efe83600eeedf8046d81659070aaaf3e7 (diff)
Merge GH #584 Changes to support Windows debugging
Diffstat (limited to 'src')
-rw-r--r--src/build-data/makefile/nmake.in2
-rwxr-xr-xsrc/scripts/install.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 119e91849..4075ccbbf 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -14,7 +14,7 @@ RM_R = $(RM) /S
RMDIR = @rmdir
# Executable targets
-CLI = %{out_dir}\botan%{program_suffix}
+CLI = %{out_dir}\botan-cli%{program_suffix}
TEST = %{out_dir}\botan-test%{program_suffix}
# Library targets
diff --git a/src/scripts/install.py b/src/scripts/install.py
index d87e69b49..33a316ad4 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -159,7 +159,8 @@ def main(args = None):
if bool(cfg['build_shared_lib']):
if str(cfg['os']) == "windows":
- soname_base = process_template('%{soname_base}') # botan.dll
+ libname = process_template('%{libname}')
+ soname_base = libname + '.dll'
copy_executable(os.path.join(out_dir, soname_base),
os.path.join(lib_dir, soname_base))
else: