diff options
author | Attila Molnar <attilamolnar@hush.com> | 2012-08-14 04:22:34 -0700 |
---|---|---|
committer | Attila Molnar <attilamolnar@hush.com> | 2012-08-14 04:22:34 -0700 |
commit | 36171f5309611d58433337a1d4b3390cb270a01e (patch) | |
tree | df66ac933919fb043a6b6a13dd026519d37af72e | |
parent | 388e4ff40931dda5870ddef149e54bdcc6c5a711 (diff) | |
parent | 8b81ddc87a70746dc54c71ab530666b06affdf81 (diff) |
Merge pull request #278 from SaberUK/insp20-fix-windows
Fix Windows build that was broken by 9b66dd6.
-rw-r--r-- | win/configure.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win/configure.cpp b/win/configure.cpp index 768b68cc5..e7ae75691 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -299,7 +299,7 @@ void Run() printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n"); string base_path = get_string_option("In what directory do you wish to install the InspIRCd base?", ".."); - string config_file = get_string_option("In what directory are the configuration files?", "conf"); + string config_path = get_string_option("In what directory are the configuration files?", "conf"); string mod_path = get_string_option("In what directory are the modules to be compiled to?", "modules"); string bin_dir = get_string_option("In what directory is the IRCd binary to be placed?", "."); @@ -309,7 +309,7 @@ void Run() // dump all the options back out printf_c("\033[0mBase install path:\033[1;32m %s\n", base_path.c_str()); - printf_c("\033[0mConfig path:\033[1;32m %s\n", config_file.c_str()); + printf_c("\033[0mConfig path:\033[1;32m %s\n", config_path.c_str()); printf_c("\033[0mModule path:\033[1;32m %s\n", mod_path.c_str()); printf_c("\033[0mSocket Engine:\033[1;32m %s\n", "select"); @@ -322,7 +322,7 @@ void Run() printf("\n"); // escape the pathes - escape_string(config_file); + escape_string(config_path); escape_string(mod_path); printf("\nWriting inspircd_config.h..."); @@ -331,6 +331,7 @@ void Run() fprintf(f, "#ifndef __CONFIGURATION_AUTO__\n"); fprintf(f, "#define __CONFIGURATION_AUTO__\n\n"); + fprintf(f, "#define CONFIG_PATH \"%s\"\n", config_path.c_str()); fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path.c_str()); fprintf(f, "#define SOMAXCONN_S \"128\"\n"); fprintf(f, "#define MAXBUF 514\n"); |