Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg

Fixes installing to /usr/local (Bug #1378)
11 years ago · 5df9ff8e2c
parent f6f6b5604a
commit 5df9ff8e2c
2 changed files with 5 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -90,13 +90,13 @@ endif(UNIX AND NOT APPLE)
 # Location of morrowind data files
 if (APPLE)
    set(MORROWIND_DATA_FILES "./data" CACHE PATH "location of Morrowind data files")
-    set(MORROWIND_RESOURCE_FILES "./resources" CACHE PATH "location of OpenMW resources files")
+    set(OPENMW_RESOURCE_FILES "./resources" CACHE PATH "location of OpenMW resources files")
 elseif(UNIX)
-    set(MORROWIND_DATA_FILES "/usr/share/games/openmw/data/" CACHE PATH "location of Morrowind data files")
-    set(MORROWIND_RESOURCE_FILES "/usr/share/games/openmw/resources/" CACHE PATH "location of OpenMW resources files")
+    set(MORROWIND_DATA_FILES "${CMAKE_INSTALL_PREFIX}/share/games/openmw/data/" CACHE PATH "location of Morrowind data files")
+    set(OPENMW_RESOURCE_FILES "${CMAKE_INSTALL_PREFIX}/share/games/openmw/resources/" CACHE PATH "location of OpenMW resources files")
 else()
    set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files")
-    set(MORROWIND_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files")
+    set(OPENMW_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files")
 endif(APPLE)

 if (WIN32)
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@ -1,4 +1,4 @@
 data="?global?data"
 data="?mw?Data Files"
 data-local="?user?data"
-resources=${MORROWIND_RESOURCE_FILES}
+resources=${OPENMW_RESOURCE_FILES}