diff options
| author |   Brad Laue <brad@gentoo.org> | 2005-03-26 07:08:32 +0000 |
|---|---|---|
| committer | Brad Laue <brad@gentoo.org> | 2005-03-26 07:08:32 +0000 |
| commit | b284572fece6d0de59bd9e540edc36afc721e647 (patch) | |
| tree | 758b9530b657568776a9955c5ac525144d7a7865 /www-client/mozilla-firefox | |
| parent | Cleanups (diff) | |
| download | gentoo-2-b284572fece6d0de59bd9e540edc36afc721e647.tar.gz gentoo-2-b284572fece6d0de59bd9e540edc36afc721e647.tar.bz2 gentoo-2-b284572fece6d0de59bd9e540edc36afc721e647.zip | |
Fix sed
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-client/mozilla-firefox')
| -rw-r--r-- | www-client/mozilla-firefox/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index e6d36ee42f36..ab23e839ae63 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.11 2005/03/25 20:03:41 brad Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.12 2005/03/26 07:08:32 brad Exp $ + + 26 Mar 2005; Brad Laue <brad@gentoo.org> mozilla-firefox-1.0.2-r1.ebuild: + Fix firefox-config to truly report library and include paths. 25 Mar 2005; Brad Laue <brad@gentoo.org> mozilla-firefox-1.0.2-r1.ebuild: Change perl -pi -e to sed -i -e - fixes bug #86639. diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild index 179197b2e5ec..d9ab96932410 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild,v 1.3 2005/03/26 07:00:14 brad Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild,v 1.4 2005/03/26 07:08:32 brad Exp $ inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher multilib @@ -131,16 +131,17 @@ src_install() { cd ${S}/build/unix # Fix firefox-config and install it - sed -i -e "s:/lib/firefox-${MY_PV}::g" firefox-config - sed -i -e "s:/firefox-${MY_PV}::g" firefox-config + sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config + sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config exeinto /usr/$(get_libdir)/MozillaFirefox doexe firefox-config # Fix pkgconfig files and install them insinto /usr/$(get_libdir)/pkgconfig for x in *.pc; do if [[ -f ${x} ]]; then - sed -i -e "s:/lib/firefox-${MY_PV}::g" ${x} - sed -i -e "s:/firefox-${MY_PV}::g" ${x} + sed -i -e + "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x} + sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x} doins ${x} fi done |