[oe-commits] Martin Jansa : gcc-configure-runtime: always remove info/dir

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 0b8fe539928c7a61ca01a4a0a0f54df47164ac6c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0b8fe539928c7a61ca01a4a0a0f54df47164ac6c

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Jan 25 20:42:51 2013 +0100

gcc-configure-runtime: always remove info/dir

* move libgomp.info removal also outside that for cycle, can be removed outside if exists
* also use infodir variable instead of ${datadir}/info

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../recipes-devtools/gcc/gcc-configure-runtime.inc |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 1c9155f..a9f77d9 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -41,12 +41,10 @@ do_install () {
 	for d in ${RUNTIMETARGET}; do
 		cd ${B}/$target/$d/
 		oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
-		if [ "$d" = "libgomp" ]; then
-			rm -rf ${D}${datadir}/info/libgomp.info ${D}${datadir}/info/dir
-			rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
-			rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info
-		fi
 	done
+	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
+	rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+	rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
 	chown -R root:root ${D}
 }