From 9b66dd6c292347acf313c1ee9506231749f3d270 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Sat, 21 Jul 2012 13:28:05 +0200 Subject: [PATCH] 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 --- configure | 1 + src/inspircd.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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. * -- 2.39.2