Toolchain: Fixup CMake toolchain script to install things in /usr

Also stop clobbering the host's /usr/local/share for DATAROOTDIR.
fleximus · Dec 25, 2019 · 99e0d8d · 99e0d8d
1 parent b5bcece
commit 99e0d8d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Toolchain/CMakeToolchain.txt b/Toolchain/CMakeToolchain.txt
@@ -8,8 +8,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
 
 # where to read from/write to
 set(CMAKE_SYSROOT $ENV{SERENITY_ROOT}/Root)
-set(CMAKE_STAGING_PREFIX $ENV{SERENITY_ROOT}/Root)
-set(CMAKE_INSTALL_PREFIX $ENV{SERENITY_ROOT}/Root)
+set(CMAKE_STAGING_PREFIX $ENV{SERENITY_ROOT}/Root/usr)
+set(CMAKE_INSTALL_PREFIX $ENV{SERENITY_ROOT}/Root/usr)
+set(CMAKE_INSTALL_DATAROOTDIR $ENV{SERENITY_ROOT}/Root/usr/share)
 
 set(CMAKE_C_COMPILER i686-pc-serenity-gcc)
 set(CMAKE_CXX_COMPILER i686-pc-serenity-g++)