From 15debc175777635ed4be157d7d7373efd43083d0 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Mon, 6 Aug 2007 10:33:33 +0000
Subject: unwrapped plugins moved to the old location

---
 firefox-xremote-client.sh.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'firefox-xremote-client.sh.in')

diff --git a/firefox-xremote-client.sh.in b/firefox-xremote-client.sh.in
index fa53f02..f6ac338 100644
--- a/firefox-xremote-client.sh.in
+++ b/firefox-xremote-client.sh.in
@@ -7,14 +7,25 @@ MOZILLA_FIVE_HOME="FFDIR"
 
 export MOZILLA_FIVE_HOME
 
+##
+## Select the propper plugin dir
+## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
+##
+if [ -x "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
+then
+  MOZ_PLUGIN_DIR="plugins-wrapped"
+else
+  MOZ_PLUGIN_DIR="plugins"
+fi
+
 ##
 ## Set LD_LIBRARY_PATH
 ##
 if [ "$LD_LIBRARY_PATH" ]
 then
-  LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR:$LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR:$LD_LIBRARY_PATH
 else
-  LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR
+  LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR
 fi
  export LD_LIBRARY_PATH
 
-- 
cgit