summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2012-07-21 13:28:05 +0200
committerattilamolnar <attilamolnar@hush.com>2012-07-21 16:01:39 +0200
commit9b66dd6c292347acf313c1ee9506231749f3d270 (patch)
tree12eebf0f3eb97ced18c77e8aa02bbbe09d907a76
parent0b3a4371c504c45c8a4504d114efb2ca674374e0 (diff)
Don't hardcode conf/inspircd.conf as the config file, allow the configure script to override it (configure asked for the path but the ircd used the hardcoded path regardless)
Fixes #264 reported by @ampt
-rwxr-xr-xconfigure1
-rw-r--r--src/inspircd.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 8edcdfe08..5a54b286b 100755
--- 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 aa03d62de..4abfb496a 100644
--- 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.
*