From 73335c71601b2f14e2f56b5dad460b5365109384 Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Wed, 19 May 2021 18:05:29 -0500
Subject: [PATCH] Fixed AZ::Utils::GetHomeDirectory function for non-Windows
 platforms (#821)

* Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms

* Adding back missing path variable

* Fix typo in homePath variable
---
 CMakeLists.txt                                                | 4 ++--
 .../Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ee08a8d16..63177e9d60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,13 +124,13 @@ foreach(external_directory ${LY_EXTERNAL_SUBDIRS})
     string(SUBSTRING ${full_directory_hash} 0 8 full_directory_hash)
     # Use the last directory as the suffix path to use for the Binary Directory
     get_filename_component(directory_name ${external_directory} NAME)
-    add_subdirectory(${external_directory} ${CMAKE_BINARY_DIR}/${directory_name}-${full_directory_hash})
+    add_subdirectory(${external_directory} ${CMAKE_BINARY_DIR}/External/${directory_name}-${full_directory_hash})
 endforeach()
 
 # The following steps have to be done after all targets are registered:
 # 1. generate a settings registry .setreg file for all ly_add_project_dependencies() and ly_add_target_dependencies() calls
 #    to provide applications with the filenames of gem modules to load
-#    This must be done before ly_delayed_target_link_libraries() as that inserts BUILD_DEPENDENCIE as MANUALLY_ADDED_DEPENDENCIES
+#    This must be done before ly_delayed_target_link_libraries() as that inserts BUILD_DEPENDENCIES as MANUALLY_ADDED_DEPENDENCIES
 #    if the build dependency is a MODULE_LIBRARY. That would cause a false load dependency to be generated
 ly_delayed_generate_settings_registry()
 # 2. link targets where the dependency was yet not declared, we need to have the declaration so we do different
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
index 9dbe8f7264..7fd8a639c3 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
@@ -41,10 +41,6 @@ namespace AZ
             if (const char* homePath = std::getenv("HOME"); homePath != nullptr)
             {
                 AZ::IO::FixedMaxPath path{homePath};
-                if (!path.empty())
-                {
-                    path /= ".o3de";
-                }
                 return path.Native();
             }
             return {};