# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1321537038 0
# Node ID 66be26816f41c0f8801b827bac33f75fb48be27d
# Parent  379bfee924ae046b4e349cb140789d7c31754b94
Up: firefox to 8.0.1. Moved /usr/lib/firefox-$VERSION to /usr/lib/firefox. Same for /usr/lib/firefox-devel-$VERSION. Its patch to work this way.

diff -r 379bfee924ae -r 66be26816f41 firefox-dev/receipt
--- a/firefox-dev/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-dev"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="development"
 SHORT_DESC="firefox devel files"
 MAINTAINER="jozee@slitaz.org"
-DEPENDS="alsa-lib sqlite seamonkey cairo dbus-glib pango atk \
+DEPENDS="alsa-lib sqlite cairo dbus-glib pango atk \
 libgio xorg-libXt xorg-libXinerama \
 xorg-libXcursor xorg-libXcomposite xorg-libXext xorg-libXdamage libxcb \
 xorg-libSM xorg-libICE"
@@ -16,7 +16,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/pkgconfig
-	cp -a $_pkg/usr/lib/firefox-devel-$VERSION $fs/usr/lib
+	cp -a $_pkg/usr/lib/firefox-devel $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 
 	# Gecko 1.9.0 compatibility...
@@ -29,17 +29,20 @@
 	cp -a $stuff/*.pc $fs/usr/lib/pkgconfig
 
 	# copy missing xpidl files
-	cp -a $_pkg/typelib/xpidl/xpidl $fs/usr/lib/firefox-devel-$VERSION/sdk/lib
+	cp -a $_pkg/typelib/xpidl/xpidl $fs/usr/lib/firefox-devel/sdk/lib
+
+	# fix version
+	sed -i "s/3\.5\../$VERSION/" $fs/usr/lib/pkgconfig/*
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
 	for i in usr/share/idl/firefox- usr/include/firefox- \
-		 usr/lib/firefox-devel- ; do
-		for j in $(ls -d $1/$i*); do
+		usr/lib/firefox-devel- ; do
+		for j in $(ls -d $1/$i* 2>/dev/null); do
 			[ "${j##*-}" = "$VERSION" ] && continue
-			rm -rf $j
+			[ -d $j ] && rm -rf $j
 		done
 	done
 }
diff -r 379bfee924ae -r 66be26816f41 firefox-dev/stuff/firefox-gtkmozembed.pc
--- a/firefox-dev/stuff/firefox-gtkmozembed.pc	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/stuff/firefox-gtkmozembed.pc	Thu Nov 17 13:37:18 2011 +0000
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=/usr/lib/firefox-devel-3.5.5
-sdkdir=/usr/lib/firefox-devel-3.5.5/sdk
+libdir=/usr/lib/firefox-devel
+sdkdir=/usr/lib/firefox-devel/sdk
 includedir=/usr/include/firefox-3.5.5
 
 Name: mozilla-gtkembedmoz
diff -r 379bfee924ae -r 66be26816f41 firefox-dev/stuff/firefox-js.pc
--- a/firefox-dev/stuff/firefox-js.pc	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/stuff/firefox-js.pc	Thu Nov 17 13:37:18 2011 +0000
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib
-sdkdir=/usr/lib/firefox-devel-3.5.5/sdk
+libdir=/usr/lib/firefox-devel/sdk/lib
+sdkdir=/usr/lib/firefox-devel/sdk
 includedir=/usr/include/firefox-3.5.5
 
 Name: JavaScript
diff -r 379bfee924ae -r 66be26816f41 firefox-dev/stuff/firefox-plugin.pc
--- a/firefox-dev/stuff/firefox-plugin.pc	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/stuff/firefox-plugin.pc	Thu Nov 17 13:37:18 2011 +0000
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib
-sdkdir=/usr/lib/firefox-devel-3.5.5/sdk
+libdir=/usr/lib/firefox-devel/sdk/lib
+sdkdir=/usr/lib/firefox-devel/sdk
 includedir=/usr/include/firefox-3.5.5
 
 Name: Mozilla Plug-In API
diff -r 379bfee924ae -r 66be26816f41 firefox-dev/stuff/firefox-xpcom.pc
--- a/firefox-dev/stuff/firefox-xpcom.pc	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/stuff/firefox-xpcom.pc	Thu Nov 17 13:37:18 2011 +0000
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=/usr
-libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib
+libdir=/usr/lib/firefox-devel/sdk/lib
 includedir=/usr/include/firefox-3.5.5
 idldir=/usr/share/idl/firefox-3.5.5/stable
 
diff -r 379bfee924ae -r 66be26816f41 firefox-dev/stuff/libxul.pc
--- a/firefox-dev/stuff/libxul.pc	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-dev/stuff/libxul.pc	Thu Nov 17 13:37:18 2011 +0000
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib
-sdkdir=/usr/lib/firefox-devel-3.5.5/sdk
+libdir=/usr/lib/firefox-devel/sdk/lib
+sdkdir=/usr/lib/firefox-devel/sdk
 includedir=/usr/include/firefox-3.5.5
 idldir=/usr/share/idl/firefox-3.5.5
 
diff -r 379bfee924ae -r 66be26816f41 firefox-langpack-fr/receipt
--- a/firefox-langpack-fr/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-langpack-fr/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-fr"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="France Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
@@ -15,7 +15,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR"
+	EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR"
 	mkdir -p $EXTDIR
 	cp -a $src/* $EXTDIR
 }
diff -r 379bfee924ae -r 66be26816f41 firefox-langpack-pt-BR/receipt
--- a/firefox-langpack-pt-BR/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-langpack-pt-BR/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-pt-BR"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="pt-BR language pack for firefox."
 MAINTAINER="claudinei@slitaz.org"
@@ -15,7 +15,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR"
+	EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR"
 	mkdir -p $EXTDIR
 	cp -a $src/* $EXTDIR
 }
diff -r 379bfee924ae -r 66be26816f41 firefox-langpack-zh_CN/receipt
--- a/firefox-langpack-zh_CN/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-langpack-zh_CN/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-zh_CN"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="Chinese Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
@@ -15,7 +15,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR"
+	EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR"
 	mkdir -p $EXTDIR
 	cp -a $src/* $EXTDIR
 }
diff -r 379bfee924ae -r 66be26816f41 firefox-langpack-zh_TW/receipt
--- a/firefox-langpack-zh_TW/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox-langpack-zh_TW/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-zh_TW"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="Chinese Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
@@ -15,7 +15,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR"
+	EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR"
 	mkdir -p $EXTDIR
 	cp -a $src/* $EXTDIR
 }
diff -r 379bfee924ae -r 66be26816f41 firefox/receipt
--- a/firefox/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,20 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="User friendly, secure and fast web browser."
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
 WEB_SITE="http://www.mozilla.org/"
-WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
+#WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
+WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
 CONFIG_FILES="/etc/firefox"
 TAGS="browser"
 
 DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
-alsa-lib xorg-libXt libfirefox libnotify"
-BUILD_DEPENDS="zip libIDL coreutils findutils libnotify-dev wireless_tools-dev \
-perl python yasm alsa-lib-dev mesa-dev"
+alsa-lib xorg-libXt libfirefox libevent libvpx"
+BUILD_DEPENDS="zip libIDL coreutils findutils wireless_tools-dev \
+perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev dbus-glib-dev"
 
 # Rules to configure and make the package.
 #
@@ -25,9 +26,18 @@
 {
 	cp -a $stuff/firefox.mozconfig $src/.mozconfig
 	cd $src
-	sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk
+	patch -Np1 -i $stuff/mozilla-firefox-1.0-lang.patch
+	patch -Np1 -i $stuff/firefox-install-dir.patch
+
+	# Fix PRE_RELEASE_SUFFIX
+	sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+		browser/base/Makefile.in
+
+	# Don't generate startup cache. Unbreaks build
+	sed -i 's/^GENERATE_CACHE ?=.*/GENERATE_CACHE = true/' \
+		toolkit/mozapps/installer/packager.mk
 	./configure $CONFIGURE_ARGS &&
-	make $MAKEFLAGS &&
+	make -j 4 &&
 	make DESTDIR=$DESTDIR install &&
 	cp -a xpcom/typelib $DESTDIR
 }
@@ -35,51 +45,52 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome \
-		$fs/usr/share $fs/etc 
+	mkdir -p $fs/usr/lib/$PACKAGE \
+		$fs/usr/share $fs/etc/$PACKAGE/profile/chrome
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib
+	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
 
 	# Home page, bookmarks file and branding.
-	cp -a $stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
+	cp -a $stuff/browserconfig.properties $fs/etc/$PACKAGE
 	cp -a $stuff/bookmarks.html \
-		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
+		$fs/etc/$PACKAGE/profile
+	mkdir -p $fs/etc/$PACKAGE/pref
 	cp -a $stuff/firefox-branding.js \
-		$fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/firefox.js
+		$fs/etc/$PACKAGE/pref/firefox.js
 
 	# User preference.
-	cp -a $stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
+	cp -a $stuff/prefs.js $fs/etc/$PACKAGE/profile
 	cp -a $stuff/userChrome.css \
-		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome
-
-	# Move default config to /etc/firefox (/usr maybe read-only)
-	for i in defaults browserconfig.properties ; do
-		mv -f $fs/usr/lib/$PACKAGE-$VERSION/$i $fs/etc/$PACKAGE
-	done
+		$fs/etc/$PACKAGE/profile/chrome
 
 	# added firefox-l10n.js to stuff to make sure its copyed for langpacks
 	cp -a $stuff/firefox-l10n.js \
-		$fs/etc/firefox/pref/firefox-l10n.js
+		$fs/etc/$PACKAGE/pref/firefox-l10n.js
 
-	ln -s /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
-	ln -s /etc/$PACKAGE $fs/usr/lib/$PACKAGE-$VERSION/defaults
+	rm -rf $fs/usr/lib/$PACKAGE/defaults
+
+	ln -sf /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE
+	ln -sf /etc/$PACKAGE $fs/usr/lib/$PACKAGE/defaults
 
 	# EULA is accepted by SliTaz project.
 	sed -i s:'pref("browser.EULA.3.accepted", false);':'pref("browser.EULA.3.accepted", true);': \
 		$fs/etc/firefox/pref/firefox.js
 
 	# Search Plugin (by: oddball)
-	cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/
+	cp -a $stuff/searchplugins $fs/usr/lib/firefox/
 	chown -R root.root $fs
 
 	# Remove unnecessary files.
-	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries/*
-	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/icons
+	rm -rf $fs/usr/lib/$PACKAGE/dictionaries/*
+	rm -rf $fs/usr/lib/$PACKAGE/icons
 	# split firefox libs
-	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/*.so
+	rm -rf $fs/usr/lib/$PACKAGE/*.so
 	#retain big firefox libs
-	cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \
-		$fs/usr/lib/$PACKAGE-$VERSION
+	cp -a $_pkg/usr/lib/$PACKAGE/libxul.so \
+		$fs/usr/lib/$PACKAGE
+	#workaround for now
+	#https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+	ln -sf firefox $fs/usr/lib/$PACKAGE/firefox-bin
 }
 
 # Pre - Post install command to set default locale.
@@ -89,10 +100,10 @@
 	root=$1
 	# Get old plugins
 	mkdir /tmp/firefox-plugins-$$
-	cp -a $root/usr/lib/firefox-*/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null
+	cp -a $root/usr/lib/firefox/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null
 	# Remove old libs and configs
-	rm -rf $root/usr/lib/firefox-*/plugins
-	rm -rf $root/usr/lib/firefox-*/dictionaries
+	rm -rf $root/usr/lib/firefox/plugins
+	rm -rf $root/usr/lib/firefox/dictionaries
 	rm -rf $root/etc/firefox
 }
 post_install()
@@ -105,8 +116,8 @@
 	fi
 	for i in /tmp/firefox-plugins-$$/* ; do
 		[ -e $i ] || continue
-		[ -e /usr/lib/firefox-*/plugins/$(basename $i) ] && continue
-		cp -a $i /usr/lib/firefox-*/plugins/
+		[ -e /usr/lib/firefox/plugins/$(basename $i) ] && continue
+		cp -a $i /usr/lib/firefox/plugins/
 	done
 	rm -rf /tmp/firefox-plugins-$$
 }
diff -r 379bfee924ae -r 66be26816f41 firefox/stuff/firefox-install-dir.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox/stuff/firefox-install-dir.patch	Thu Nov 17 13:37:18 2011 +0000
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff -r 379bfee924ae -r 66be26816f41 firefox/stuff/firefox.mozconfig
--- a/firefox/stuff/firefox.mozconfig	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox/stuff/firefox.mozconfig	Thu Nov 17 13:37:18 2011 +0000
@@ -10,6 +10,8 @@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
 #ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
 
 ac_add_options --enable-crypto
 ac_add_options --enable-jemalloc
diff -r 379bfee924ae -r 66be26816f41 firefox/stuff/mozilla-firefox-1.0-lang.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox/stuff/mozilla-firefox-1.0-lang.patch	Thu Nov 17 13:37:18 2011 +0000
@@ -0,0 +1,12 @@
+--- mozilla/browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
++++ mozilla/browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
+@@ -253,6 +253,9 @@
+ pref("font.language.group", "chrome://global/locale/intl.properties");
+ pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+ 
++// Use LANG environment variable to choose locale
++pref("intl.locale.matchOS", true);
++
+ // 0=lines, 1=pages, 2=history , 3=text size
+ pref("mousewheel.withcontrolkey.action",3);
+ pref("mousewheel.withshiftkey.action",2);
diff -r 379bfee924ae -r 66be26816f41 firefox/stuff/prefs.js
--- a/firefox/stuff/prefs.js	Thu Nov 17 13:11:35 2011 +0000
+++ b/firefox/stuff/prefs.js	Thu Nov 17 13:37:18 2011 +0000
@@ -9,6 +9,6 @@
  * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
  */
 
-user_pref("general.useragent.extra.firefox", "Firefox/4.0 (SliTaz GNU/Linux)");
+user_pref("general.useragent.extra.firefox", "Firefox/8.0.1 (SliTaz GNU/Linux)");
 user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8");
 user_pref("font.name.serif.x-western", "DejaVu Sans");
diff -r 379bfee924ae -r 66be26816f41 libfirefox/receipt
--- a/libfirefox/receipt	Thu Nov 17 13:11:35 2011 +0000
+++ b/libfirefox/receipt	Thu Nov 17 13:37:18 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libfirefox"
-VERSION="8.0"
+VERSION="8.0.1"
 CATEGORY="network"
 SHORT_DESC="firefox lib files"
 MAINTAINER="jozee@slitaz.org"
@@ -14,20 +14,20 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/$WANTED-$VERSION
-	cp -a $_pkg/usr/lib/$WANTED-$VERSION/*.so $fs/usr/lib/$WANTED-$VERSION
+	mkdir -p $fs/usr/lib/$WANTED
+	cp -a $_pkg/usr/lib/$WANTED/*.so $fs/usr/lib/$WANTED
 	
 	# remove some firefox libs (in firefox receipts)
-	rm -rf $fs/usr/lib/firefox-$VERSION/libxul.so
+	rm -rf $fs/usr/lib/firefox/libxul.so
 	
 	# Remove unnecessary files (copied from firefox receipt)
-	rm -rf $fs/usr/lib/firefox-$VERSION/libsqlite3.so
+	rm -rf $fs/usr/lib/firefox/libsqlite3.so
 }
 
 post_install()
 {
-# Export firefox libraries
-	for i in /usr/lib/firefox*/*.so ; do
+	# Export firefox libraries
+	for i in /usr/lib/firefox/*.so ; do
 		[ -f $i ] && ln -sf $i /usr/lib
 	done	
 }