Fixed Bug causing the base directory to always overwrite the other dirs

Added Base Directory Path to the Path list at the end of ./configure
Added Library Path to the path list at the end of ./configure


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2294 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 9 insertions, 4 deletions

diff --git a/configure b/configure
index 7ebe23714..2a6296f55 100755
--- a/configure
+++ b/configure
@@ -225,11 +225,14 @@ if ($config{CHANGE_COMPILER} =~ /y/i)
 print "\n";
 
 # Directory Settings..
+my $tmpbase = $config{BASE_DIR};
 dir_check("do you wish to install the InspIRCd base", "BASE_DIR");
-$config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Directory
-$config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");        # Modules Directory
-$config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");            # Binary Directory
-$config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");            # Library Directory
+if ($tmpbase ne $config{BASE_DIR}) {
+	$config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Directory
+	$config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");        # Modules Directory
+	$config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");            # Binary Directory
+	$config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");            # Library Directory
+}
 
 dir_check("are the configuration files", "CONFIG_DIR");
 dir_check("are the modules to be compiled to", "MODULE_DIR");
@@ -485,8 +488,10 @@ if ($var eq "1") {
 }
 
 print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
+print "\033[0mBase install path:\033[1;32m\t\t$config{BASE_DIR}\n";
 print "\033[0mConfig path:\033[1;32m\t\t\t$config{CONFIG_DIR}\n";
 print "\033[0mModule path:\033[1;32m\t\t\t$config{MODULE_DIR}\n";
+print "\033[0mLibrary path:\033[1;32m\t\t\t$config{LIBRARY_DIR}\n";
 print "\033[0mMax connections:\033[1;32m\t\t$config{MAX_CLIENT}\n";
 print "\033[0mMax User Channels:\033[1;32m\t\t$config{MAX_CHANNE}\n";
 print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\n";