diff options
Diffstat (limited to 'eclass/mozilla-app.eclass')
| -rw-r--r-- | eclass/mozilla-app.eclass | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/eclass/mozilla-app.eclass b/eclass/mozilla-app.eclass index d00e3fe..edb40e7 100644 --- a/eclass/mozilla-app.eclass +++ b/eclass/mozilla-app.eclass @@ -11,16 +11,11 @@ WANT_AUTOCONF="2.1" inherit base multilib toolchain-funcs autotools python flag-o-matic pax-utils mozilla-scm -MAJ_XUL_PV="7.0" - S="${WORKDIR}/${XULRUNNER_HG_MODULE}" # # Some per-application stuff # -MOZLIBDIR="/usr/$(get_libdir)/xulrunner-${MAJ_XUL_PV}" -MOZDEVELDIR="/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}" -SDKDIR="${MOZDEVELDIR}/sdk" MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" case "${PN}" in firefox) @@ -126,9 +121,8 @@ function mozilla-app_src_prepare() { # Gentoo install dirs sed -i \ -e 's:$(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):$(includedir)/idl:' \ - -e 's:$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):firefox:' \ - -e 's:$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION):firefox:' \ - -e 's:$(MOZ_APP_VERSION):'"${MAJ_XUL_PV}:" \ + -e 's:$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):'${PN}':' \ + -e 's:$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION):'${PN}':' \ config/autoconf.mk.in \ || die "${MAJ_XUL_PV} sed failed!" @@ -432,14 +426,8 @@ function mozilla-app_src_install() { echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}.desktop fi - rm "${ED}"/usr/bin/xulrunner - - # env.d file for ld search path - dodir /etc/env.d - echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed" - - pax-mark m "${ED}"/${MOZLIBDIR}/plugin-container - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN} # Plugins dir dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ |