1 files changed, 62 insertions, 0 deletions
diff --git a/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch
new file mode 100644
index 0000000..a49181c
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.44.12.2_p20190721/04-respect-1.patch
@@ -0,0 +1,62 @@
+respect DFHACK_LIBRARY_DESTINATION
+
+From: eroen <dfhack@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt              |    4 ++--
+ plugins/ruby/CMakeLists.txt |    2 ++
+ plugins/ruby/ruby.cpp       |    6 +++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c4d5568..aada996d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,11 +187,11 @@ set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command li
+ # the dfhack libraries will be installed here:
+ IF(UNIX)
+     # put the lib into DF/hack
+-    SET(DFHACK_LIBRARY_DESTINATION hack)
++    SET(DFHACK_LIBRARY_DESTINATION hack CACHE INTERNAL "")
+     SET(DFHACK_EGGY_DESTINATION libs)
+ ELSE()
+     # windows is crap, therefore we can't do nice things with it. leave the libs on a nasty pile...
+-    SET(DFHACK_LIBRARY_DESTINATION .)
++    SET(DFHACK_LIBRARY_DESTINATION . CACHE INTERNAL "")
+     SET(DFHACK_EGGY_DESTINATION .)
+ ENDIF()
+ # external tools will be installed here:
+diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
+index c2c80e79..36750bee 100644
+--- a/plugins/ruby/CMakeLists.txt
++++ b/plugins/ruby/CMakeLists.txt
+@@ -76,6 +76,8 @@ INCLUDE_DIRECTORIES("${dfhack_SOURCE_DIR}/depends/tthread")
+ 
+ DFHACK_PLUGIN(ruby ruby.cpp LINK_LIBRARIES dfhack-tinythread)
+ ADD_DEPENDENCIES(ruby ruby-autogen-rb)
++set_property( SOURCE "ruby.cpp" APPEND PROPERTY COMPILE_DEFINITIONS
++        "DFHACK_LIBRARY_DESTINATION=\"${DFHACK_LIBRARY_DESTINATION}\"" )
+ 
+ IF(EXISTS ${RUBYLIB})
+     INSTALL(FILES ${RUBYLIB} DESTINATION ${DFHACK_LIBRARY_DESTINATION} RENAME ${RUBYLIB_INSTALL_NAME})
+diff --git a/plugins/ruby/ruby.cpp b/plugins/ruby/ruby.cpp
+index 240a67cb..4811aa2f 100644
+--- a/plugins/ruby/ruby.cpp
++++ b/plugins/ruby/ruby.cpp
+@@ -323,12 +323,12 @@ static int df_loadruby(void)
+ {
+     const char *libpaths[] = {
+ #if defined(WIN32)
+-        "./libruby.dll",
++        DFHACK_LIBRARY_DESTINATION "./libruby.dll",
+ #elif defined(__APPLE__)
+-        "hack/libruby.dylib",
++        DFHACK_LIBRARY_DESTINATION "/libruby.dylib",
+         "/System/Library/Frameworks/Ruby.framework/Ruby",
+ #else
+-        "hack/libruby.so",
++        DFHACK_LIBRARY_DESTINATION "hack/libruby.so",
+         "libruby.so",
+ #endif
+         NULL