Addresses review comments and fixes.

Author: mordante

libcxx/CMakeLists.txt

@@ -428,7 +428,7 @@ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE STRING
     "Path where target-agnostic libc++ headers should be installed.")
 set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING
     "Path where built libc++ runtime libraries should be installed.")
-set(LIBCXX_INSTALL_MODULE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/../modules/c++/v1" CACHE STRING
+set(LIBCXX_INSTALL_MODULE_DIR "usr/share/libc++/v1" CACHE STRING
     "Path where target-agnostic libc++ modules should be installed.")
 
 set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library.")

libcxx/modules/CMakeLists.txt

@@ -215,11 +215,11 @@ add_custom_target(generate-cxx-modules
 # file. This allows moving the entire installation to a different to a
 # different location.
 file(RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
-	${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
-	${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULE_DIR})
+  ${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
+  ${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULE_DIR})
 configure_file(
   "modules.json.in"
-  "${LIBCXX_LIBRARY_DIR}/modules.json"
+  "${LIBCXX_LIBRARY_DIR}/libc++.modules.json"
   @ONLY
 )
 
@@ -248,7 +248,7 @@ if (LIBCXX_INSTALL_MODULES)
 
   # Install the module manifest.
   install(FILES
-      "${LIBCXX_LIBRARY_DIR}/modules.json"
+      "${LIBCXX_LIBRARY_DIR}/libc++.modules.json"
     DESTINATION "${LIBCXX_INSTALL_LIBRARY_DIR}"
     COMPONENT cxx-modules
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

libcxx/modules/modules.json.in

@@ -8,7 +8,7 @@
       "is-standard-library": true,
       "local-arguments": {
         "system-include-directories": [
-          "@LIBCXX_MODULE_RELATIVE_PATH@/std"
+          "@LIBCXX_MODULE_RELATIVE_PATH@"
         ]
       }
     },
@@ -18,8 +18,7 @@
       "is-std-library": true,
       "local-arguments": {
         "system-include-directories": [
-          "@LIBCXX_MODULE_RELATIVE_PATH@/std",
-          "@LIBCXX_MODULE_RELATIVE_PATH@/std.compat"
+          "@LIBCXX_MODULE_RELATIVE_PATH@"
         ]
       }
     }

libcxx/src/CMakeLists.txt

@@ -397,7 +397,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES)
     if(LIBCXX_INSTALL_HEADERS)
       set(header_install_target install-cxx-headers)
     endif()
-	if(LIBCXX_INSTALL_MODULES)
+    if(LIBCXX_INSTALL_MODULES)
       set(header_install_target install-cxx-modules)
     endif()
     add_custom_target(install-cxx