X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-firefox;h=922f78fd45b6934e45f629a3263ccb1259670d0e;hb=d9b6d06a1d66ad40d61192ef241a1c41f83a8047;hp=190c13232cd12fcde6cb8dfff05c868d43e6c36c;hpb=589342af5c6b0235fc6194ae39f76bbcd12d683e;p=hvlinux.git

diff --git a/stage3/cis-firefox b/stage3/cis-firefox
index 190c132..922f78f 100755
--- a/stage3/cis-firefox
+++ b/stage3/cis-firefox
@@ -6,15 +6,15 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-# Applying patches (if any)
-apply_patches ${1} &&
+PACKAGE=${1}
 
-# Get the name of the decompressed directory
-SOURCE_DIR=$(static_decompressed_dirname ${1})
+# Applying patches (if any)
+apply_patches ${PACKAGE} &&
 
 FIREFOX_BUILD_DIR="${1}-build"
+FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
-cd ${LFS_TMP}/${SOURCE_DIR} &&
+cd ${LFS_TMP}/${PACKAGE} &&
 cat > .mozconfig << "EOF"
 # This file contains the options used in the Firefox build.
 
@@ -130,16 +130,16 @@ ln -v -sf firefox /usr/bin/netscape &&
 # Remove old links
 rm -f /usr/lib/mozilla &&
 rm -f /usr/lib/firefox &&
-rm -f /usr/lib/${1}/plugins/libjavaplugin_oji.so &&
+rm -f /usr/lib/${FIREFOX_PKG_VERSION}/plugins/libjavaplugin_oji.so &&
 
-ln -v -sf ${1} /usr/lib/mozilla &&
-ln -v -sf ${1} /usr/lib/firefox &&
+ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla &&
+ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox &&
 # To use the installed Java plugin.
-ln -v -s ${JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/${1}/plugins &&
+ln -v -s ${JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/${FIREFOX_PKG_VERSION}/plugins &&
 
 # Addition to /etc/ld.so.conf
 # This is necessary for shared library libmozjs.so (needed by gxine)
-string_add "/usr/lib/${1}" /etc/ld.so.conf &&
+string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf &&
 
 ldconfig