1 files changed, 86 insertions, 0 deletions
diff --git a/games-util/dfhack/files/dfhack-0.43.05.2/0001-Respect-DFHACK_DATA_DESTINATION.patch b/games-util/dfhack/files/dfhack-0.43.05.2/0001-Respect-DFHACK_DATA_DESTINATION.patch
new file mode 100644
index 0000000..c84100b
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.43.05.2/0001-Respect-DFHACK_DATA_DESTINATION.patch
@@ -0,0 +1,86 @@
+From 535e526ec838dae0d28290d22f57caa376ae3fa8 Mon Sep 17 00:00:00 2001
+From: eroen <dfhack@occam.eroen.eu>
+Date: Sun, 16 Jul 2017 22:33:38 +0200
+Subject: [PATCH 1/5] Respect DFHACK_DATA_DESTINATION
+
+---
+ CMakeLists.txt         |  2 +-
+ library/CMakeLists.txt |  3 +++
+ library/Core.cpp       | 12 +++++++++---
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e78340d..e22cea0b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@ ENDIF()
+ # external tools will be installed here:
+ SET(DFHACK_BINARY_DESTINATION .)
+ # dfhack data goes here:
+-SET(DFHACK_DATA_DESTINATION hack)
++SET(DFHACK_DATA_DESTINATION hack CACHE INTERNAL "")
+ # plugin libs go here:
+ SET(DFHACK_PLUGIN_DESTINATION hack/plugins)
+ # dfhack header files go here:
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 40c122de..e71eb888 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -75,6 +75,9 @@ RemoteServer.cpp
+ RemoteTools.cpp
+ )
+ 
++set_property( SOURCE "Core.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
++	"DFHACK_DATA_DESTINATION=\"${DFHACK_DATA_DESTINATION}\"" )
++
+ SET(MAIN_SOURCES_WINDOWS
+ Console-windows.cpp
+ Hooks-windows.cpp
+diff --git a/library/Core.cpp b/library/Core.cpp
+index fccf7f46..77c4021a 100644
+--- a/library/Core.cpp
++++ b/library/Core.cpp
+@@ -75,6 +75,7 @@ using namespace DFHack;
+ #include <stdio.h>
+ #include <iomanip>
+ #include <stdlib.h>
++#include <string.h>
+ #include <fstream>
+ #include "tinythread.h"
+ #include "md5wrapper.h"
+@@ -511,6 +512,7 @@ void Core::getScriptPaths(std::vector<std::string> *dest)
+     }
+     dest->push_back(df_path + "/raw/scripts");
+     dest->push_back(df_path + "/hack/scripts");
++    dest->push_back(DFHACK_DATA_DESTINATION "/scripts");
+     for (auto it = script_paths[1].begin(); it != script_paths[1].end(); ++it)
+         dest->push_back(*it);
+ }
+@@ -1507,7 +1509,11 @@ void Core::fatal (std::string output)
+ std::string Core::getHackPath()
+ {
+ #ifdef LINUX_BUILD
+-    return p->getPath() + "/hack/";
++    if(strncmp(DFHACK_DATA_DESTINATION, "hack", 5) == 0)
++        // This is the default value
++        return p->getPath() + "/hack/";
++    else
++        return DFHACK_DATA_DESTINATION "/";
+ #else
+     return p->getPath() + "\\hack\\";
+ #endif
+@@ -1537,9 +1543,9 @@ bool Core::Init()
+ 
+     // find out what we are...
+     #ifdef LINUX_BUILD
+-        const char * path = "hack/symbols.xml";
++        const char * path = DFHACK_DATA_DESTINATION "/symbols.xml";
+     #else
+-        const char * path = "hack\\symbols.xml";
++        const char * path = DFHACK_DATA_DESTINATION "\\symbols.xml";
+     #endif
+     vif = new DFHack::VersionInfoFactory();
+     cerr << "Identifying DF version.\n";
+-- 
+2.13.0
+