summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-12-20 19:37:38 +0000
committerChristian Persch <chpe@src.gnome.org>2003-12-20 19:37:38 +0000
commitbe650ccb12a1e3650a59c657aadd10de99e0cc86 (patch)
tree56008c69f760fef40ea67de109f8d56578e08d8a
parentbca887232147dbba6505adc69ed22ae4f34f1dde (diff)
downloadepiphany-be650ccb12a1e3650a59c657aadd10de99e0cc86.tar.gz
Always set MOZILLA_FIVE_HOME to the correct value.
2003-12-20 Christian Persch <chpe@cvs.gnome.org> * src/epiphany.in: Always set MOZILLA_FIVE_HOME to the correct value.
-rw-r--r--ChangeLog6
-rw-r--r--src/epiphany.in9
2 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b33595676..cc704b914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2003-12-20 Christian Persch <chpe@cvs.gnome.org>
+ * src/epiphany.in:
+
+ Always set MOZILLA_FIVE_HOME to the correct value.
+
+2003-12-20 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-main.c: (ephy_main_start),
(ephy_main_translate_url_arguments):
* src/ephy-shell.c: (ephy_nautilus_view_init_factory),
diff --git a/src/epiphany.in b/src/epiphany.in
index 5efa1562e..49e8ee449 100644
--- a/src/epiphany.in
+++ b/src/epiphany.in
@@ -2,14 +2,7 @@
dist_bin=`dirname $0`
-if test -n "$MOZILLA_FIVE_HOME"; then
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-else
- echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- exit
-fi
+MOZILLA_HOME=@MOZILLA_HOME@
if [ -z "$MOZ_PLUGIN_PATH" ]; then
MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla