--- glibc-2.3.4.20040808-r1.ebuild	2006-01-25 21:52:34.000000000 +0100
+++ glibc-2.3.4.20040808-r1.ebuild	2006-01-25 21:52:21.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.52 2006/01/11 01:04:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.51 2005/12/03 00:55:13 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -666,21 +666,21 @@
 	# some silly people set LD_RUN_PATH and that breaks things.
 	# see bug 19043
 	unset LD_RUN_PATH
+	# Pick out the correct location for build headers
+	local headersloc=$(alt_headers)
+	tc-is-cross-compiler && headersloc=${ROOT}${headersloc}
 
 	einfo "Configuring GLIBC..."
 	rm -rf ${WORKDIR}/build
 	mkdir -p ${WORKDIR}/build
 	cd ${WORKDIR}/build
-	# Pick out the correct location for build headers
-	local headersloc=$(alt_headers)
-	tc-is-cross-compiler && headersloc=${ROOT}${headersloc}
 	${S}/configure \
 		--build=${CHOST} \
 		--host=${CTARGET} \
 		--disable-profile \
 		--without-gd \
 		--without-cvs \
-		--with-headers=${headersloc} \
+		--with-headers=$(headersloc) \
 		--prefix=$(alt_prefix) \
 		--mandir=$(alt_prefix)/share/man \
 		--infodir=$(alt_prefix)/share/info \