Removed __single_client_alloc again because gcc devs were smoking crack and removed it

[user/henk/code/inspircd.git] / .inspircd.inc

diff --git a/.inspircd.inc b/.inspircd.inc
index 4f70bad75b5568636c44dc76b898223a88b96ab9..24e280019640aa3932676fe99530bf71a0e08825 100644 (file)
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -15,10 +15,11 @@
 #               I HATE PERL.. kthxbye
 # ---------------------------------------------------
 
-$ENV{"LD_LIBRARY_PATH"} = $ENV{"LD_LIBRARY_PATH"} . ":/usr/local/lib/mysql:/usr/lib/mysql";
-
 my $conffile = "@CONFIG_DIR@/inspircd.conf";
-my $binpath = "@BINARY_DIR@/inspircd";
+my $binpath = "@BINARY_DIR@";
+my $libpath = "@LIBRARY_DIR@";
+
+$ENV{"LD_LIBRARY_PATH"} = $ENV{"LD_LIBRARY_PATH"} . ":/usr/local/lib/mysql:/usr/lib/mysql:$libpath";
 
 # Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
 my $arg = $ARGV[0];
@@ -82,11 +83,11 @@ sub start {
         # Check to see its not 'running' already.
         if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
         # If we are still alive here.. Try starting the IRCd..
-        system($binpath);
+        system("$binpath/inspircd");
         sleep 1;
         if (getstatus() == 0) {
                 print "InspIRCd Seemingly not started, Log follows:\n";
-                system("tail ircd.log");
+                system("tail $binpath/ircd.log");
         } else {
                 # We're good!
                 return 1;
@@ -97,15 +98,7 @@ sub debug {
         # Check to see its not 'running' already.
         if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
         # If we are still alive here.. Try starting the IRCd..
-        system("gdb --args $binpath -nofork -debug");
-        sleep 1;
-        if (getstatus() == 0) {
-                print "InspIRCd Seemingly not started, Log follows:\n";
-                system("tail ircd.log");
-        } else {
-                # We're good!
-                return 1;
-        }
+        system("gdb --args $binpath/inspircd -nofork -debug");
 }