Fix sed

Package-Manager: portage-2.0.51.19

3 files changed, 12 insertions, 8 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/Manifest b/www-client/mozilla-firefox/Manifest
index 28ddfda42307..c4859b3572a0 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -2,14 +2,14 @@ MD5 623dae2f5f0c5e67e488711b00ae3957 mozilla-firefox-1.0-r3.ebuild 5951
 MD5 28199d760fdfd8703247dc0536832b82 mozilla-firefox-1.0_rc2.ebuild 5073
 MD5 38d4c1da97bddf35b76da780c40389b5 mozilla-firefox-1.0.1.ebuild 6297
 MD5 6f631456061fa3b3131e63c3e0c7e004 mozilla-firefox-1.0_pre-r2.ebuild 5080
-MD5 f0c68e13f68a9c2d7019cb949c3d6557 mozilla-firefox-1.0.2-r1.ebuild 7712
+MD5 a5d2651cec78aa8dd7883ff06d730187 mozilla-firefox-1.0.2-r1.ebuild 7805
 MD5 e7b51ac324211f6233d670725fc56ba7 mozilla-firefox-1.0-r2.ebuild 5484
 MD5 eafdcd3d88b3a24aca03d99aaf06bd85 mozilla-firefox-0.9.3.ebuild 8433
 MD5 98d20592c2d9f0bf878f5209150a494d mozilla-firefox-1.0_rc1.ebuild 5154
 MD5 47a961b1c0836a5f831bb13981eb4c11 mozilla-firefox-1.0.ebuild 5064
 MD5 abb589f883243f5283f8042c818c5cb6 mozilla-firefox-1.0.1-r1.ebuild 6626
 MD5 72bd8081c96391d1cd9ea4624db2ed0b mozilla-firefox-1.0.2.ebuild 6615
-MD5 fbc541fcc88d5021999db558a98ca0ec ChangeLog 18793
+MD5 f3a82e7d1a38579259d6935d7418da7e ChangeLog 18934
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
 MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0 73
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