Use sysroot-ed path for the include dir.

(Portage version: 2.1_pre7-r4)

4 files changed, 13 insertions, 7 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index e301e84a3f17..934e9b1c32a4 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.19 2006/03/30 13:50:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.20 2006/04/10 02:15:29 vapier Exp $
+
+*binutils-config-1.8-r7 (10 Apr 2006)
+
+  10 Apr 2006; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
+  -binutils-config-1.8-r6.ebuild, +binutils-config-1.8-r7.ebuild:
+  Use sysroot-ed path for the include dir.
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   binutils-config-1.8-r6.ebuild:
diff --git a/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild b/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild
index 0bc96350626b..9e397f88a1cb 100644
--- a/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild
+++ b/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r6.ebuild,v 1.2 2006/03/30 13:50:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r7.ebuild,v 1.1 2006/04/10 02:15:29 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index 79a8993c5e18..27176f3f6dd8 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.8
+++ b/sys-devel/binutils-config/files/binutils-config-1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.13 2006/04/10 02:15:29 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -127,7 +127,7 @@ switch_profile() {
 		if [[ ${TARGET} == ${HOST} ]] ; then
 			dstinc=${ROOT}/usr/include
 		else
-			dstinc=${ROOT}/usr/${TARGET}/include
+			dstinc=${ROOT}/usr/${TARGET}/usr/include
 		fi
 		mkdir -p "${dstinc}"
 		for x in * ; do
@@ -193,7 +193,7 @@ uninstall_target() {
 		rm -f "${ROOT}"/usr/${TARGET}/bin/${x}
 	done
 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
-		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
+		rm -f "${ROOT}"/usr/${TARGET}/{usr/,}include/${x}
 	done
 	for x in bfd iberty opcodes ; do
 		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
@@ -202,7 +202,7 @@ uninstall_target() {
 	find "${ROOT}"/usr/${TARGET}/lib -xtype l -exec rm {} \;
 	rmdir "${ROOT}"/usr/${HOST}/${TARGET}/lib "${ROOT}"/usr/${HOST}/${TARGET} 2>/dev/null
 	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	rmdir "${ROOT}"/usr/${TARGET}/{bin,include,lib} "${ROOT}"/usr/${TARGET} 2>/dev/null
+	rmdir "${ROOT}"/usr/${TARGET}/{usr/,}{bin,include,lib,usr} "${ROOT}"/usr/${TARGET} 2>/dev/null
 	rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
 
 	rm -f "${ENV_D}"/${TARGET}-*
@@ -305,7 +305,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.13 2006/04/10 02:15:29 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r6 b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r6
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7