Remove support for building with BSD Make.

[user/henk/code/inspircd.git] / make / template / inspircd

diff --git a/make/template/inspircd b/make/template/inspircd
index 8405c2a6b8fbf6400b1d81227bb3115d40878af1..949f85ceef845e3cc5b3583025bcec539b0a5455 100644 (file)
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -55,7 +55,7 @@ my $runpath   =       "@BASE_DIR@";
 my $datadir    =       "@DATA_DIR@";
 my $valgrindlogpath    =       "$basepath/valgrindlogs";
 my $executable =       "inspircd";
-my $version    =       "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@";
+my $version    =       "@VERSION_FULL@";
 my $uid = "@UID@";
 
 if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
@@ -153,7 +153,7 @@ sub cmd_rehash()
 
 sub cmd_cron()
 {
-       if (getstatus() == 0) { goto &cmd_start(); }
+       if (getstatus() == 0) { goto &cmd_start(@_); }
        exit GENERIC_EXIT_UNSPECIFIED;
 }
 
@@ -167,7 +167,7 @@ sub cmd_restart(@)
 {
        cmd_stop();
        unlink($pidfile) if (-e $pidfile);
-       goto &cmd_start;
+       goto &cmd_start(@_);
 }
 
 sub hid_cheese_sandwich()
@@ -242,7 +242,7 @@ sub dev_valdebug(@)
        # If we are still alive here.. Try starting the IRCd..
        # May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
        # Could be useful when we want to stop it complaining about things we're sure aren't issues.
-       exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+       exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
        die "Failed to start valgrind: $!\n";
 }
 
@@ -276,7 +276,7 @@ sub dev_valdebug_unattended(@)
                sysopen STDERR, "$valgrindlogpath/valdebug.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0666 or die "Can't open $valgrindlogpath/valdebug.$suffix: $!\n";
        # May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
        # Could be useful when we want to stop it complaining about things we're sure aren't issues.
-               exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
+               exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=30 --track-fds=yes),
                        "--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
                        qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
                        "$binpath/$executable", qw(--nofork --debug --nolog), @_;
@@ -301,7 +301,7 @@ sub dev_screenvaldebug(@)
        # If we are still alive here.. Try starting the IRCd..
        print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
        print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-       exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+       exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
        die "Failed to start screen: $!\n";
 }