upraveno hledani cesty k adresari knihoven "lib" pomoci __FILE__; odstranen...

upraveno hledani cesty k adresari knihoven "lib" pomoci __FILE__; odstranen update cest z instalacniho skriptu

src/warden-server/lib/Warden.pm

@@ -23,8 +23,8 @@ use SOAP::Lite;
 use Carp;
 use File::Basename;
 
-my $basedir = "/opt/warden-server/";
-use lib $basedir . "lib";
+my $lib = File::Basename::dirname(__FILE__);
+use lib $lib;
 use WardenCommon;
 
 
@@ -33,8 +33,8 @@ use WardenCommon;
 #				VARIABLES
 ################################################################################
 our $VERSION = "2.2";
-my $etc = $basedir . "etc";
-our $FILENAME = File::Basename::basename($0);
+our $FILENAME = File::Basename::basename(__FILE__);
+my $etc = "$lib/../etc";
 
 
 

src/warden-server/sh/install.sh

@@ -248,19 +248,6 @@ PerlSwitches -I $lib
 }
 
 
-changeServerPath()
-{
-	echo -n "Update server prefix path ... ";
-	perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm 2> $err; ret_val=`echo $?`
-
-        if [ $ret_val -eq 0 ]; then
-                echo "OK"
-        else
-                errClean
-        fi
-}
-
-
 createSymlinks()
 {
 	echo "Creating symbolic links ..."
@@ -341,9 +328,6 @@ makeServerConf
 # create Apache configuration file
 makeApacheConf
 
-# update prefix in lib directory path
-changeServerPath
-
 # crate symlinks from warden server bin directory to /usr/local/bin
 createSymlinks