| Summary: | www-client/mozilla-firefox-3.5.1 ebuild fails to build with multilib setup | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Thomas Sachau <tommy> |
| Component: | New packages | Assignee: | Mozilla Gentoo Team <mozilla> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | High | ||
| Version: | 2008.0 | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
|
Description
Thomas Sachau
2009-07-27 20:49:30 UTC
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.1-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.1-r2.ebuild
index 376e4dd..91ed8ce 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.5.1-r2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.1-r2.ebuild
@@ -241,6 +241,8 @@ src_compile() {
}
src_install() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
emake DESTDIR="${D}" install || die "emake install failed"
rm "${D}"/usr/bin/firefox
@@ -281,8 +283,9 @@ EOF
fperms 0755 /usr/bin/firefox
#Enable very specific settings not inherited from xulrunner
+ dodir
cp "${FILESDIR}"/firefox-default-prefs.js \
- "${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "failed to cp xulrunner-default-prefs.js"
+ "${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || die "failed to cp xulrunner-default-prefs.js"
# Plugins dir
ln -s "${D}"/usr/$(get_libdir)/{nsbrowser,mozilla-firefox}/plugins
If it looks fine to you let me know and I will queue it for -r2
I dont see a need for the dodir command without argument, but else it looks ok and should work. -r2 has been added to the tree with the proper fix. |