Add changes from CleverRaven#62234

Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
alef · Nov 25, 2022 · 7ccc28e · 7ccc28e
1 parent 49a6898
commit 7ccc28e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,6 +107,9 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda)
     endif ()
+    if (NOT README_DIR)
+        set(README_DIR ${DATA_PREFIX})
+    endif ()
     if (NOT LOCALE_DIR)
         set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale)
     endif ()
@@ -131,6 +134,9 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Windows|MSYS)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/data)
     endif ()
+    if (NOT README_DIR)
+        set(README_DIR ${CMAKE_INSTALL_PREFIX})
+    endif ()
     if (NOT LOCALE_DIR)
         set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/lang)
     endif ()

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -30,9 +30,9 @@ if (RELEASE)
         ${CMAKE_SOURCE_DIR}/README.md
         ${CMAKE_SOURCE_DIR}/LICENSE.txt
         ${CMAKE_SOURCE_DIR}/LICENSE-OFL-Terminus-Font.txt
-        DESTINATION ${CMAKE_INSTALL_PREFIX})
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc DESTINATION ${CMAKE_INSTALL_PREFIX})
+        DESTINATION ${README_DIR})
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc DESTINATION ${DATA_PREFIX})
     if (TILES)
-        install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${CMAKE_INSTALL_PREFIX})
+        install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${DATA_PREFIX})
     endif()
 endif ()