aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-06 22:58:07 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-06 22:58:07 +0800
commit91edd219e3e228dfaa559d524401aceed31329c7 (patch)
tree53c6d5e55fb93f282bab1afc04312e1cfd788b86 /embed/mozilla
parent8f8805588ab31f3646fe8fb6e27191a962bc1eb8 (diff)
downloadgsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar.gz
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar.bz2
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar.lz
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar.xz
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.tar.zst
gsoc2013-epiphany-91edd219e3e228dfaa559d524401aceed31329c7.zip
Add out private plugin directory to MOZ_PLUGIN_PATH too.
2005-10-06 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed-single.cpp: Add out private plugin directory to MOZ_PLUGIN_PATH too.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/Makefile.am1
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp7
2 files changed, 6 insertions, 2 deletions
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index ae1585ca2..fd10910fe 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -116,6 +116,7 @@ libephymozillaembed_la_CPPFLAGS = \
-I$(MOZILLA_INCLUDE_ROOT) \
$(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
-DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
-DALLOW_PRIVATE_API \
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 34cc1f0d5..f01fbcab3 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -356,8 +356,11 @@ mozilla_init_plugin_path ()
user_path = g_getenv ("MOZ_PLUGIN_PATH");
new_path = g_strconcat (user_path ? user_path : "",
user_path ? ":" : "",
- MOZILLA_PREFIX "/lib/mozilla/plugins:"
- MOZILLA_HOME "/plugins",
+ MOZILLA_PREFIX "/lib/mozilla/plugins"
+ ":" MOZILLA_HOME "/plugins",
+#ifdef HAVE_PRIVATE_PLUGINS
+ ":" PLUGINDIR,
+#endif
NULL);
g_setenv ("MOZ_PLUGIN_PATH", new_path, TRUE);