From 88a83bab1ffa06cda668f8018e4b5c2c276a9a5d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 22 Jan 2022 17:27:10 +0100
Subject: [PATCH] Remove predefined data paths `data="?global?data"`,
 `data=./data` (#6564)

---
 CHANGELOG.md           | 1 +
 CMakeLists.txt         | 3 ---
 files/openmw.cfg       | 1 -
 files/openmw.cfg.local | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b80da169c6..efc831db0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
+    Task #6564: Remove predefined data paths `data="?global?data"`, `data=./data`
 
 0.47.0
 ------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae840fb8b3..75cc8ae10f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,7 +181,6 @@ endif()
 
 # Set up common paths
 if (APPLE)
-    set(MORROWIND_DATA_FILES "./data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "../Resources/resources" CACHE PATH "location of OpenMW resources files")
 elseif(UNIX)
     # Paths
@@ -199,10 +198,8 @@ elseif(UNIX)
     ENDIF()
     SET(SYSCONFDIR "${GLOBAL_CONFIG_PATH}/openmw" CACHE PATH "Set config dir")
 
-    set(MORROWIND_DATA_FILES "${DATADIR}/data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "${DATADIR}/resources" CACHE PATH "location of OpenMW resources files")
 else()
-    set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files")
 endif(APPLE)
 
diff --git a/files/openmw.cfg b/files/openmw.cfg
index d98097c3eb..f524911489 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -3,7 +3,6 @@
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
 content=builtin.omwscripts
-data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 704ac68068..bed9b9b10a 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -3,8 +3,6 @@
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
 content=builtin.omwscripts
-data="?global?data"
-data=./data
 data-local="?userdata?data"
 resources=./resources
 script-blacklist=Museum