Don't hardcode conf/inspircd.conf as the config file, allow the configure script...

Fixes #264 reported by @ampt

diff --git a/configure b/configure
index 8edcdfe08b0a2179c54c47f88f696d3d809c6530..5a54b286be341fcb9ef9525a2f00bb51ae0076cd 100755 (executable)
--- a/configure
+++ b/configure
@@ -861,6 +861,7 @@ sub writefiles {
 #define CoreExport /**/
 #define DllExport /**/
 
+#define CONFIG_PATH "$config{CONFIG_DIR}"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define SOMAXCONN_S "$config{_SOMAXCONN}"
 #define ENTRYPOINT int main(int argc, char** argv)

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index aa03d62dee4835f8d67300ea1c0e3ff6bb2fe992..4abfb496a3e26e80b63aa186fa3b1453b98a2999 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -303,7 +303,7 @@ void InspIRCd::WritePID(const std::string &filename)
 }
 
 InspIRCd::InspIRCd(int argc, char** argv) :
-        ConfigFileName("conf/inspircd.conf"),
+        ConfigFileName(CONFIG_PATH "/inspircd.conf"),
 
         /* Functor pointer initialisation.
          *