From bd549eb23f698796ca10abf60ade39faf8679cd5 Mon Sep 17 00:00:00 2001
From: Seth Riley <17361645+Qudix@users.noreply.github.com>
Date: Mon, 2 Nov 2020 13:40:21 -0600
Subject: [PATCH] Moving things around

---
 .gitignore            | 1 +
 src/conf.cpp          | 4 ++--
 src/tasks/boost.cpp   | 4 ++--
 src/tasks/openssl.cpp | 1 -
 src/tasks/python.cpp  | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b133cb1..b024c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 /vs/obj
 /vs/.vs
 /vs/*.user
+/.vs
 /mob.exe
 /mob.log
diff --git a/src/conf.cpp b/src/conf.cpp
index 2accbe7..f60163c 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -1154,7 +1154,7 @@ void init_options(
 
 	make_canonical_path(
 		"install_pythoncore",
-		paths::install_bin(), "pythoncore");
+		paths::install_dlls(), "pythoncore");
 
 	make_canonical_path(
 		"install_stylesheets",
@@ -1162,7 +1162,7 @@ void init_options(
 
 	make_canonical_path(
 		"install_translations",
-		paths::install_bin(), "translations");
+		paths::install_dlls(), "translations");
 
 	conf::set_global("tools", "iscc", path_to_utf8(find_iscc()));
 }
diff --git a/src/tasks/boost.cpp b/src/tasks/boost.cpp
index e8e6431..dad4078 100644
--- a/src/tasks/boost.cpp
+++ b/src/tasks/boost.cpp
@@ -124,7 +124,7 @@ void boost::build_and_install_prebuilt()
 	{
 		op::copy_file_to_dir_if_better(cx(),
 			lib_path(arch::x64) / python_dll(),
-			paths::install_bin());
+			paths::install_dlls());
 	});
 }
 
@@ -193,7 +193,7 @@ void boost::build_and_install_from_source()
 	{
 		op::copy_file_to_dir_if_better(cx(),
 			lib_path(arch::x64) / python_dll(),
-			paths::install_bin());
+			paths::install_dlls());
 	});
 }
 
diff --git a/src/tasks/openssl.cpp b/src/tasks/openssl.cpp
index 91b43e3..8f88ce7 100644
--- a/src/tasks/openssl.cpp
+++ b/src/tasks/openssl.cpp
@@ -186,7 +186,6 @@ void openssl::install_engines()
 
 void openssl::copy_files()
 {
-	copy_dlls_to(paths::install_bin());
 	copy_dlls_to(paths::install_dlls());
 	copy_pdbs_to(paths::install_pdbs());
 }
diff --git a/src/tasks/python.cpp b/src/tasks/python.cpp
index ef428ff..77c2d4e 100644
--- a/src/tasks/python.cpp
+++ b/src/tasks/python.cpp
@@ -209,12 +209,12 @@ void python::copy_files()
 
 	op::copy_glob_to_dir_if_better(cx(),
 		build_path() / "libffi*.dll",
-		paths::install_bin(),
+		paths::install_dlls(),
 		op::copy_files);
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".dll"),
-		paths::install_bin());
+		paths::install_dlls());
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".pdb"),
@@ -227,7 +227,7 @@ void python::copy_files()
 
 	op::copy_file_to_file_if_better(cx(),
 		build_path() / "pythoncore" / ("python" + version_for_dll() + ".zip"),
-		paths::install_bin() / "pythoncore.zip",
+		paths::install_dlls() / "pythoncore.zip",
 		op::copy_files);
 }