Merge pull request swiftlang#314 from aciidb0mb3r/fix-install-path

Fix the install path for the toolchain

Author: shahmishal

dispatch/CMakeLists.txt

@@ -14,12 +14,12 @@ install(FILES
           source.h
           time.h
         DESTINATION
-          ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
+          "${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
 if(ENABLE_SWIFT)
   get_filename_component(MODULE_MAP module.modulemap REALPATH)
   install(FILES
             ${MODULE_MAP}
           DESTINATION
-            ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
+            "${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
 endif()
 

os/CMakeLists.txt

@@ -6,5 +6,5 @@ install(FILES
           object.h
           linux_base.h
         DESTINATION
-          "${CMAKE_INSTALL_FULL_INCLUDEDIR}/os")
+          "${CMAKE_INSTALL_LIBDIR}/swift/os")
 

src/CMakeLists.txt

@@ -202,7 +202,7 @@ add_custom_command(TARGET dispatch POST_BUILD
 install(TARGETS
           dispatch
         DESTINATION
-          "${CMAKE_INSTALL_LIBDIR}")
+          "${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}")
 if(ENABLE_SWIFT)
   install(FILES
             ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule