Split up db/conf/lib/locale install directories, and allow alternate ones to be specified at runtime

6 files changed, 8 insertions, 8 deletions

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index e3156de4f..3653a59f1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -90,7 +90,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
           endif(WIN32)
           # Set the module to be installed to the module directory under the data directory
           install(TARGETS ${SO}
-            DESTINATION data/modules
+            DESTINATION ${LIB_DIR}/modules
           )
         endif(HAS_FUNCTION)
       else(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES)
@@ -190,7 +190,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
           endif(WIN32)
           # Set the module to be installed to the module directory under the data directory
           install(TARGETS ${SO}
-            DESTINATION data/modules
+            DESTINATION ${LIB_DIR}/modules
           )
          else(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION)
           message("  This is not a fatal error - ${SUBDIR} will not be built.")
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 14e894e0c..45f39c26d 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -76,7 +76,7 @@ class DBFlatFile : public Module
 	void OnReload() anope_override
 	{
 		ConfigReader config;
-		DatabaseFile = config.ReadValue("db_flatfile", "database", "anope.db", 0);
+		DatabaseFile = db_dir + "/" + config.ReadValue("db_flatfile", "database", "anope.db", 0);
 	}
 
 	EventReturn OnLoadDatabase() anope_override
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 2783a29b2..d0aceb9f3 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -264,7 +264,7 @@ static dbFILE *open_db_read(const char *service, const char *filename, int versi
 	int myversion;
 
 	f = new dbFILE;
-	strscpy(f->filename, filename, sizeof(f->filename));
+	strscpy(f->filename, (db_dir + "/" + filename).c_str(), sizeof(f->filename));
 	f->mode = 'r';
 	fp = fopen(f->filename, "rb");
 	if (!fp)
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 935ef95a2..7ee9a95b4 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -651,7 +651,7 @@ class DBPlain : public Module
 	void OnReload() anope_override
 	{
 		ConfigReader config;
-		DatabaseFile = config.ReadValue("db_plain", "database", "anope.db", 0);
+		DatabaseFile = db_dir + "/" + config.ReadValue("db_plain", "database", "anope.db", 0);
 	}
 
 	EventReturn OnLoadDatabase() anope_override
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index fff3e67d1..4cf66cb5f 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -105,7 +105,7 @@ class ModuleSQLite : public Module
 
 			if (this->SQLiteServices.find(connname) == this->SQLiteServices.end())
 			{
-				Anope::string database = config.ReadValue("sqlite", "database", "anope", i);
+				Anope::string database = db_dir + "/" + config.ReadValue("sqlite", "database", "anope", i);
 
 				try
 				{
diff --git a/modules/third/language/CMakeLists.txt b/modules/third/language/CMakeLists.txt
index af4dd90a6..85278f5be 100644
--- a/modules/third/language/CMakeLists.txt
+++ b/modules/third/language/CMakeLists.txt
@@ -29,8 +29,8 @@ if(GETTEXT_FOUND)
     endif(NOT WIN32)
 
     # Install the new language file
-    install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/data/languages/${LANG_LANG}/LC_MESSAGES/)")
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO} DESTINATION data/languages/${LANG_LANG}/LC_MESSAGES RENAME ${LANG_DOMAIN}.mo PERMISSIONS ${PERMS})
+    install(CODE "FILE(MAKE_DIRECTORY ${LOCALE_DIR}/${LANG_LANG}/LC_MESSAGES/)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO} DESTINATION ${LOCALE_DIR}/${LANG_LANG}/LC_MESSAGES RENAME ${LANG_DOMAIN}.mo PERMISSIONS ${PERMS})
   endforeach(LANG_PO)
 
   # Generate languages, depends on the mo files