merged 'Revert "Moving things around"' pr

src/core/conf.cpp

@@ -508,9 +508,9 @@ void resolve_paths()
 	resolve_path("install_loot",         p.install_bin(),  "loot");
 	resolve_path("install_plugins",      p.install_bin(),  "plugins");
 	resolve_path("install_licenses",     p.install_bin(),  "licenses");
-	resolve_path("install_pythoncore",   p.install_dlls(), "pythoncore");
+	resolve_path("install_pythoncore",   p.install_bin(),  "pythoncore");
 	resolve_path("install_stylesheets",  p.install_bin(),  "stylesheets");
-	resolve_path("install_translations", p.install_bin(),  "resources/translations");
+	resolve_path("install_translations", p.install_bin(),  "translations");
 
 	// finally, resolve the tools that are unlikely to be in PATH; all the
 	// other tools (7z, jom, patch, etc.) are assumed to be in PATH (which

src/tasks/boost.cpp

@@ -116,7 +116,7 @@ void boost::build_and_install_prebuilt()
 {
 	op::copy_file_to_dir_if_better(cx(),
 		lib_path(arch::x64) / python_dll(),
-		conf().path().install_dlls());
+		conf().path().install_bin());
 }
 
 void boost::fetch_from_source()
@@ -170,7 +170,7 @@ void boost::build_and_install_from_source()
 
 	op::copy_file_to_dir_if_better(cx(),
 		lib_path(arch::x64) / python_dll(),
-		conf().path().install_dlls());
+		conf().path().install_bin());
 }
 
 void boost::do_b2(

src/tasks/openssl.cpp

@@ -161,6 +161,7 @@ void openssl::install_engines()
 void openssl::copy_files()
 {
 	copy_dlls_to(conf().path().install_bin());
+	copy_dlls_to(conf().path().install_dlls());
 	copy_pdbs_to(conf().path().install_pdbs());
 }
 

src/tasks/python.cpp

@@ -186,12 +186,12 @@ void python::copy_files()
 
 	op::copy_glob_to_dir_if_better(cx(),
 		build_path() / "libffi*.dll",
-		conf().path().install_dlls(),
+		conf().path().install_bin(),
 		op::copy_files);
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".dll"),
-		conf().path().install_dlls());
+		conf().path().install_bin());
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".pdb"),
@@ -204,7 +204,7 @@ void python::copy_files()
 
 	op::copy_file_to_file_if_better(cx(),
 		build_path() / "pythoncore" / ("python" + version_for_dll() + ".zip"),
-		conf().path().install_dlls() / "pythoncore.zip",
+		conf().path().install_bin() / "pythoncore.zip",
 		op::copy_files);
 }