From 76734198f2c32d2d9741c3516541726c6a7e0d33 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Tue, 1 Aug 2000 23:17:59 +0000
Subject: [PATCH] Avoid double slash problem when ObjDir is ''.

---
 tools/tinderbox/build-seamonkey-util.pl | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl
index 05f0fbd722fc..f19a64da2c87 100644
--- a/tools/tinderbox/build-seamonkey-util.pl
+++ b/tools/tinderbox/build-seamonkey-util.pl
@@ -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";