Merge insp20

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

diff --git a/make/template/inspircd b/make/template/inspircd
index a75140c5dbcd8fccaa20c07501e763143b30ba8a..c14099323ea81487c06ab622f5a2b201f9212c3d 100644 (file)
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -27,12 +27,13 @@ my $basepath        =       "@BASE_DIR@";
 my $confpath   =       "@CONFIG_DIR@/";
 my $binpath    =       "@BINARY_DIR@";
 my $runpath    =       "@BASE_DIR@";
+my $datadir    =       "@DATA_DIR@";
 my $valgrindlogpath    =       "$basepath/valgrindlogs";
-my $executable =       "@EXECUTABLE@";
+my $executable =       "inspircd";
 my $version    =       "@VERSION@";
 my $uid = "@UID@";
 
-if ($< == 0 || $> == 0) {
+if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
        if ($uid !~ /^\d+$/) {
                # Named UID, look it up
                $uid = getpwnam $uid;
@@ -382,7 +383,7 @@ sub getpidfile
        }
 
        # End of includes / No includes found. Using default.
-       $pidfile = $runpath . "/data/inspircd.pid";
+       $pidfile = $datadir . "/inspircd.pid";
 }
 
 sub getstatus {