Make sure we don't add a colon at the end of LD_LIBRARY_PATH, which will

2004-05-12  Christian Persch  <chpe@cvs.gnome.org>

	* src/epiphany.in:

	Make sure we don't add a colon at the end of LD_LIBRARY_PATH,
	which will make LD_LIBRARY_PATH include the current directory.
	Should fix bug #141576.

2 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index abdc46306..11c65fe90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-12  Christian Persch  <chpe@cvs.gnome.org>
+
+	* src/epiphany.in:
+
+	Make sure we don't add a colon at the end of LD_LIBRARY_PATH,
+	which will make LD_LIBRARY_PATH include the current directory.
+	Should fix bug #141576.
+
 2004-05-11  Christian Persch  <chpe@cvs.gnome.org>
 
 	* lib/ephy-dialog.c: (set_combo_box_from_value):
diff --git a/src/epiphany.in b/src/epiphany.in
index b0d6ae181..3aad0baaf 100644
--- a/src/epiphany.in
+++ b/src/epiphany.in
@@ -22,7 +22,11 @@ if [ ! -d $HOME/.gnome2/epiphany/mozilla/epiphany -a -d $HOME/.galeon/mozilla/ga
 	|| :
 fi
 
-LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
 export LD_LIBRARY_PATH
 
 MOZILLA_FIVE_HOME=$MOZILLA_HOME