From ac6d83f9ba4234936546b583761ce56391612d21 Mon Sep 17 00:00:00 2001
From: H0zen <compteh@ub.ro>
Date: Sun, 16 Jun 2019 16:44:19 +0300
Subject: [PATCH] Fixed some annoyances

  - CONF_INSTALL_DIR is no longer hardcoded, except for the case
    when it's explicitely specified via -D in cmake
  - extractor scripts are now copied in tools directory
  - fixed some changes in ACE which made servers crash in FreeBSD
---
 CMakeLists.txt           | 17 +++++++++++------
 cmake/FindDL.cmake       |  1 -
 dep                      |  2 +-
 src/modules/Eluna        |  2 +-
 src/shared/revision.h    |  6 +++---
 src/tools/CMakeLists.txt | 16 +++++++++++++++-
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcc9064c..80cb39e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,9 +75,11 @@ message("")
 #==================================================================================#
 
 project(MaNGOS VERSION 0.22.0)
+
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install CACHE PATH "Default install directory" FORCE)
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Default install directory" FORCE)
 endif()
+
 if(DEBUG)
   set(CMAKE_BUILD_TYPE Debug)
 else()
@@ -85,11 +87,15 @@ else()
 endif()
 
 if(UNIX)
-    set(BIN_DIR          ${CMAKE_INSTALL_PREFIX}/bin)
-    set(CONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc)
+    set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+    if (NOT CONF_INSTALL_DIR)
+        set(CONF_INSTALL_DIR ../etc)
+    endif()
 else()
-    set(BIN_DIR          ${CMAKE_INSTALL_PREFIX})
-    set(CONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+    set(BIN_DIR ${CMAKE_INSTALL_PREFIX})
+    if (NOT CONF_INSTALL_DIR)
+        set(CONF_INSTALL_DIR .)
+    endif()
 endif()
 
 
@@ -112,4 +118,3 @@ add_subdirectory(dep)
 add_subdirectory(src)
 
 include(${CMAKE_SOURCE_DIR}/cmake/StatusInfo.cmake)
-
diff --git a/cmake/FindDL.cmake b/cmake/FindDL.cmake
index bd8b031c..633e8a50 100644
--- a/cmake/FindDL.cmake
+++ b/cmake/FindDL.cmake
@@ -22,7 +22,6 @@ find_package_handle_standard_args(DL
     FOUND_VAR
         DL_FOUND
     REQUIRED_VARS
-        DL_LIBRARY
         DL_INCLUDE_DIR
 )
 
diff --git a/dep b/dep
index 26edd0e9..8e67306e 160000
--- a/dep
+++ b/dep
@@ -1 +1 @@
-Subproject commit 26edd0e965f55a43ab42e314c28452a087828e2c
+Subproject commit 8e67306e2ac73634ddf54f59f3c198a217cd1213
diff --git a/src/modules/Eluna b/src/modules/Eluna
index c027d0bc..ba8891e4 160000
--- a/src/modules/Eluna
+++ b/src/modules/Eluna
@@ -1 +1 @@
-Subproject commit c027d0bcb5868e87413214e9b68e99b33db41039
+Subproject commit ba8891e447a9ee7b0da0088a50943977ebb68aa2
diff --git a/src/shared/revision.h b/src/shared/revision.h
index 2c4f69be..f3b2d0b7 100644
--- a/src/shared/revision.h
+++ b/src/shared/revision.h
@@ -24,7 +24,7 @@
 
 #ifndef MANGOS_H_REVISION
 #define MANGOS_H_REVISION
-    #define REVISION_NR "2116012"
+    #define REVISION_NR "2116016"
 
     #define REALMD_DB_VERSION_NR 21
     #define REALMD_DB_STRUCTURE_NR 2
@@ -38,6 +38,6 @@
 
     #define WORLD_DB_VERSION_NR 21
     #define WORLD_DB_STRUCTURE_NR 16
-    #define WORLD_DB_CONTENT_NR 012
-    #define WORLD_DB_UPDATE_DESCRIPTION "quest_8332_text_update"
+    #define WORLD_DB_CONTENT_NR 016
+    #define WORLD_DB_UPDATE_DESCRIPTION "Fix typo in quest 5064"
 #endif // __REVISION_H__
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 00c7c22b..25000cbd 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -17,4 +17,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-add_subdirectory(Extractor_projects)
\ No newline at end of file
+add_subdirectory(Extractor_projects)
+
+#install documentation and generation scripts
+install(
+    FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/ExtractResources.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/make_vmaps.bat"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/mmap_excluded.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/MoveMapGen.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/offmesh.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/README.txt"
+    DESTINATION
+        "${BIN_DIR}/${TOOLS_DIR}"
+)
+