Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Bor Kraljič <pyrobor AT ver.si>:

 z-java/jdk6-bin/HISTORY |    3 +++
 z-java/jdk6-bin/INSTALL |   23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit d8aca1e45f58d63fb55225e1c6cba2cde5a2d8b8
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    jdk6-bin: added path to install plugin for firefox

diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 0846196..ec31f0a 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+       * INSTALL: added path to install plugin for firefox
+
 2011-06-13 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 6u26, SECURITY_PATCH++, PATCHLEVEL--
 
diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index f705e2c..0616a5f 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -18,14 +18,25 @@ then
 
   if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
   then
+    message "${MESSAGE_COLOR}Installing plugin for 
xulrunner${DEFAULT_COLOR}" &&
     ln -sf 
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so  \
            ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so &&
     ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
            ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
-  fi
+  fi &&
+
+  if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+  then
+    message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}" 
&&
+    ln -sf 
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so  \
+           ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so &&
+    ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+           ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+  fi &&
 
   if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
   then
+    message "${MESSAGE_COLOR}Installing plugin for 
firefox-bin${DEFAULT_COLOR}" &&
     ln -sf 
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so  \
     ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so &&
     ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
@@ -41,9 +52,17 @@ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
 
   if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
   then
+    message "${MESSAGE_COLOR}Installing plugin for 
xulrunner${DEFAULT_COLOR}" &&
     ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
            ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
-  fi
+  fi &&
+
+  if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+  then
+    message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}" 
&&
+    ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+           ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+  fi &&
 
   if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
   then