diff --git a/CMakeLists.txt b/CMakeLists.txt
index 331f8c9..813a1d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,12 +30,21 @@ if(FXLIBC_TARGET STREQUAL gint)
 
   # Default to fxSDK install path
   if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "${FXSDK_COMPILER_INSTALL}" CACHE PATH "..." FORCE)
+    set(FXLIBC_PREFIX_IS_FXSDK 1 CACHE PATH "..." FORCE)
   endif()
 
-  if(CMAKE_INSTALL_PREFIX STREQUAL "${FXSDK_COMPILER_INSTALL}")
-    set(LIBDIR ".")
-    set(INCDIR "include")
+  if(FXLIBC_PREFIX_IS_FXSDK)
+    # Use the fxSDK paths; these variables are uncached so we are always up-to-
+    # date, even if the compiler is upgraded without removing the fxlibc build
+    # folder (which happens with GiteaPC)
+    execute_process(
+      COMMAND fxsdk path include
+      OUTPUT_VARIABLE INCDIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(
+      COMMAND fxsdk path lib
+      OUTPUT_VARIABLE LIBDIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
   endif()
 endif()