Avoid double slash problem when ObjDir is ''.

This commit is contained in:
mcafee%netscape.com 2000-08-01 23:17:59 +00:00
Родитель 5b6a28fffd
Коммит 76734198f2
1 изменённых файлов: 10 добавлений и 3 удалений

Просмотреть файл

@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime);
use Cwd;
use File::Basename; # for basename();
use Config; # for $Config{sig_name} and $Config{sig_num}
$::UtilsVersion = '$Revision: 1.25 $ ';
$::UtilsVersion = '$Revision: 1.26 $ ';
package TinderUtils;
@ -269,8 +269,15 @@ sub LoadConfig {
sub SetupEnv {
umask 0;
my $topsrcdir = "$Settings::BaseDir/$Settings::DirName/mozilla";
$ENV{LD_LIBRARY_PATH} = "$topsrcdir/${Settings::ObjDir}/dist/bin:"
. "$ENV{LD_LIBRARY_PATH}";
if ($Settings::ObjDir ne '') {
$ENV{LD_LIBRARY_PATH} = "$topsrcdir/${Settings::ObjDir}/dist/bin:"
. "$ENV{LD_LIBRARY_PATH}";
} else {
$ENV{LD_LIBRARY_PATH} = "$topsrcdir/dist/bin:"
. "$ENV{LD_LIBRARY_PATH}";
}
$ENV{LIBPATH} = "$topsrcdir/${Settings::ObjDir}/dist/bin:"
. "$ENV{LIBPATH}";
$ENV{MOZILLA_FIVE_HOME} = "$topsrcdir/${Settings::ObjDir}/dist/bin";