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

(From OE-Core rev: 0b8fe539928c7a61ca01a4a0a0f54df47164ac6c)

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

diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 1c9155f..a9f77d9 100644 (file)
--- 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}
 }