Patchwork [4/7] gcc-configure-runtime: always remove info/dir

login
mail settings
Submitter Martin Jansa
Date Jan. 25, 2013, 7:42 p.m.
Message ID <0f39a188698a35354e59b32ed5d4f824438a3add.1359142768.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43413/
State Accepted
Commit 0b8fe539928c7a61ca01a4a0a0f54df47164ac6c
Headers show

Comments

Martin Jansa - Jan. 25, 2013, 7:42 p.m.
* 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@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Patch

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}
 }