--- mozilla-firefox-2.0_rc2.ebuild-old	2006-10-15 11:36:20.000000000 -0500
+++ mozilla-firefox-2.0_rc2.ebuild	2006-10-16 15:54:09.795934000 -0500
@@ -145,14 +145,23 @@
 	gcc-specs-ssp && append-flags -fno-stack-protector-all
 	filter-flags -fstack-protector -fstack-protector-all
 
-	#  Configure and build
-
-	CPPFLAGS="${CPPFLAGS} -DGENTOO_NSPLUGINS_DIR=\\\"/usr/$(get_libdir)/nsplugins\\\""
-	CPPFLAGS="${CPPFLAGS} -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/$(get_libdir)/nsbrowser/plugins\\\""
-	export CPPFLAGS
-	tc-export CC CXX LD
+	####################################
+	#
+ 	#  Configure and build
+	#
+	####################################
+ 
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	econf || die
 
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
 	edit_makefiles