[oe-commits] Tom Rini : gdb-common.inc: Nuke a few more possible conflicts.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1e2e6295dae84b73ba33c24ddeeb8916667afe68
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1e2e6295dae84b73ba33c24ddeeb8916667afe68

Author: Tom Rini <tom_rini at mentor.com>
Date:   Mon Oct  4 16:29:17 2010 -0700

gdb-common.inc: Nuke a few more possible conflicts.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/gdb/gdb-common.inc |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/recipes/gdb/gdb-common.inc b/recipes/gdb/gdb-common.inc
index 344c10b..48a12d1 100644
--- a/recipes/gdb/gdb-common.inc
+++ b/recipes/gdb/gdb-common.inc
@@ -23,13 +23,16 @@ S = "${WORKDIR}/gdb-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
 do_install_append() {
-	# these mo files from gdb-cross-sdk clash with files from binutils-cross-sdk
-	# when building sdk archives. Drop them for now as a way to restore toolchains.
-	rm -f ${D}/${datadir}/locale/*/LC_MESSAGES/{bfd,opcodes}.mo
+	# these mo and doc files from gdb-cross-sdk clash with files from
+	# binutils-cross-sdk when building sdk archives. Drop them for now as a
+	# way to restore toolchains.
+	rm -f ${D}${datadir}/locale/*/LC_MESSAGES/{bfd,opcodes}.mo
+	rm -rf ${D}${docdir}/bfd.html
 
 	# we don't care about these infos, installed from binutils
-	rm -f ${D}/${infodir}/{configure,standards,bfd}.info
-	rm -f ${D}/${infodir}/dir
+	rm -f ${D}${infodir}/{configure,standards,bfd}.info
+	rm -f ${D}${docdir}/{configure,standards,bfd,libiberty}.html
+	rm -f ${D}${infodir}/dir
 
 	# We use libiberty from binutils
 	rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
@@ -41,4 +44,3 @@ do_install_append() {
 	# Use libopcodes from binutils.
 	rm -f ${D}${prefix}/lib/libopcodes.{,l}a
 }
-