aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-05-13 05:05:41 +0800
committerChristian Persch <chpe@src.gnome.org>2004-05-13 05:05:41 +0800
commit1f989f68601be5b49660e735f119168128563b2d (patch)
tree797e168fd48785dbc499b5374608da793310450b
parent7ccf7782479a1cbdfb8cec2353edf1bb56e2bab1 (diff)
downloadgsoc2013-epiphany-1f989f68601be5b49660e735f119168128563b2d.tar.gz
gsoc2013-epiphany-1f989f68601be5b49660e735f119168128563b2d.tar.zst
gsoc2013-epiphany-1f989f68601be5b49660e735f119168128563b2d.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--src/epiphany.in6
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 567a320f1..c42ba8532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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-12 Christian Persch <chpe@cvs.gnome.org>
+
* lib/widgets/ephy-cell-renderer-progress.c:
(ephy_cell_renderer_progress_class_init),
(ephy_cell_renderer_progress_init),
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