*** empty log message ***

4 files changed, 43 insertions, 22 deletions

diff --git a/NEWS b/NEWS
index b5513eaa8..33b7edf18 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ Interface improvements
 	  topics, better editor interface using a toplevel window with a
 	  menubar, file manager like editing capabilities, ability to open
 	  the editor indipendentlyi, "most used" special topic.
+	  They certainly need love, but I think we have a good direction now.
 	  (Marco, Dave Bordoley, Xan Lopez)
 	* Properly save maximized/unmaximized state of the main window (Marco)
 	* Remove spinner configuration and default to Gnome spinner,
@@ -87,23 +88,22 @@ Bugfixes
 	  (Dan Damian)
 
 Translations
-
+	* am (Daniel Yacob)
+	* ca (Pablo Saratxaga)
+	* da (Ole Laursen)
 	* de (Christian Neumair)
-	no (Kjartan Maraas)
-	nl (Vincent van Adrighem),
-	am (Daniel Yacob)
-	es (Javier Fernandez)
-	tr (Fatih Demir)
-	zh_TW (Abel Cheung)
-	fr (Christophe Fergeau, Laurent Richard)
-	ja (Takayuki KUSANO)
-	ca (Pablo Saratxaga)
-	sv (Christian Rose)
-	da (Ole Laursen)
-	ru (Dmitry G. Mastrukov)
-	el (Kostas Papadimas)
-	pl (Zbigniew Chyla),
-	ko (Kang Jeong-Hee)
-	pt (Duarte Loreto)
-	pt_BR (Evandro Fernandes Giovanini)
-	  
+	* el (Kostas Papadimas)
+	* es (Javier Fernandez)
+	* fr (Christophe Fergeau, Laurent Richard)
+	* ja (Takayuki KUSANO)
+	* ko (Kang Jeong-Hee)
+	* no (Kjartan Maraas)
+	* nl (Vincent van Adrighem)
+	* pl (Zbigniew Chyla),
+	* pt (Duarte Loreto)
+	* pt_BR (Evandro Fernandes Giovanini)
+	* ru (Dmitry G. Mastrukov)
+	* sv (Christian Rose)
+	* tr (Fatih Demir)
+	* zh_TW (Abel Cheung)
+  
diff --git a/src/.cvsignore b/src/.cvsignore
index 87ddcd37b..2df9a6b39 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -8,3 +8,4 @@ EphyAutomation-common.c
 EphyAutomation-skels.c
 EphyAutomation-stubs.c
 EphyAutomation.h
+epiphany-bin
diff --git a/src/Makefile.am b/src/Makefile.am
index 03882891f..42b2bd0f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGNOME_DISABLE_DEPRECATED
 
-bin_PROGRAMS = epiphany
+bin_PROGRAMS = epiphany-bin
 
 CXXLD = $(CXX)
 LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -39,7 +39,7 @@ else
 nautilus_view_sources =
 endif
 
-epiphany_SOURCES = 				    	\
+epiphany_bin_SOURCES = 				    	\
 	$(ephy_automation_interface_idl_sources) 	\
 	$(nautilus_view_sources)			\
 	appearance-prefs.c				\
@@ -92,7 +92,7 @@ epiphany_SOURCES = 				    	\
 	window-commands.c				\
 	window-commands.h
 
-epiphany_LDADD = \
+epiphany_bin_LDADD = \
 	$(top_builddir)/embed/libephyembed.la \
 	$(top_builddir)/lib/libephy.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
diff --git a/src/epiphany.in b/src/epiphany.in
new file mode 100644
index 000000000..fe0c28f5d
--- /dev/null
+++ b/src/epiphany.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+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
+
+LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "$dist_bin/epiphany-bin" "$@"