4 files changed, 16 insertions, 7 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 17b477db8..94cdd9e25 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -114,8 +114,7 @@ all_x86_64 -> "-momit-leaf-frame-pointer"
 <mach_abi_linking>
 all     -> "-pthread"
 
-cilkplus -> "-fcilkplus"
-openmp   -> "-fopenmp"
+openmp  -> "-fopenmp"
 
 mips64  -> "-mabi=64"
 s390    -> "-m31"
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
index 89098c466..2c97ef792 100644
--- a/src/build-data/makefile.in
+++ b/src/build-data/makefile.in
@@ -11,6 +11,7 @@ LANG_FLAGS     = %{cc_lang_flags}
 CXXFLAGS       = %{cc_compile_flags}
 WARN_FLAGS     = %{cc_warning_flags}
 SO_OBJ_FLAGS   = %{shared_flags}
+LDFLAGS        = %{ldflags}
 
 LIB_LINK_CMD   = %{lib_link_cmd}
 EXE_LINK_CMD   = %{exe_link_cmd}
@@ -27,7 +28,7 @@ INSTALLED_LIB_DIR = %{prefix}/%{libdir}
 POST_LINK_CMD  = %{post_link_cmd}
 
 # The primary target
-all: libs cli tests
+all: libs cli tests docs
 
 # Executable targets
 CLI           = %{cli_exe}
@@ -40,18 +41,18 @@ libs: $(LIBRARIES)
 
 # Misc targets
 
+docs:
+%{build_doc_commands}
+
 clean:
 	$(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}"
 
 distclean:
 	$(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}" --distclean
 
-install: $(CLI) docs
+install: libs cli docs
 	$(PYTHON_EXE) $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
 
-docs:
-%{build_doc_commands}
-
 # Object Files
 LIBOBJS       = %{lib_objs}
 
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index 4c8ba2c47..41716e21a 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -4,6 +4,8 @@ soname_pattern_base  "libbotan-{version_major}.dylib"
 soname_pattern_abi   "libbotan-{version_major}.{abi_rev}.dylib"
 soname_pattern_patch "libbotan-{version_major}.{abi_rev}.{version_minor}.{version_patch}.dylib"
 
+# In order that these executables work from the build directory,
+# we need to change the install names
 so_post_link_command "install_name_tool -change '$(INSTALLED_LIB_DIR)/{soname_abi}' '@executable_path/{soname_abi}' $@"
 
 doc_dir doc
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index efc9733c9..898dfc65f 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -1,8 +1,15 @@
 os_type windows
 
+cli_exe_name botan-cli
+
 program_suffix .exe
 obj_suffix obj
 static_suffix lib
+lib_prefix ''
+
+# For historical reasons? the library does not have the major number on Windows
+# This should probably be fixed in a future major release.
+library_name 'botan'
 
 soname_pattern_base "{libname}.dll"