diff --git a/core/bin/setlib.cfg b/core/bin/setlib.cfg index 855f819e56..27c93ec191 100644 --- a/core/bin/setlib.cfg +++ b/core/bin/setlib.cfg @@ -30,14 +30,12 @@ # $ENV{FOSWIKI_ASSERTS} = 1; # to your bin/LocalLib.cfg -use vars qw( $foswikiLibPath @localPerlLibPath ); +our $foswikiLibPath; +our @localPerlLibPath; -require FindBin; -my ($bin) = $FindBin::Bin =~ /^(.*)$/; -use Cwd (); -my ($LocalLib) = Cwd::abs_path( "$bin/LocalLib.cfg" ) =~ /(.*)/; - -eval 'require "'.$LocalLib.'";'; +my $LocalLib = $INC{'setlib.cfg'}; # the dir where this setlib.cfg resides +$LocalLib =~ s/setlib.cfg$/LocalLib.cfg/; +do $LocalLib if -r $LocalLib; # if foswikiLibPath isn't defined, then see if $twikiLibPath is # for compatibility