Don't try to move binaries onto themselves if ${bindir} and
${base_bindir} are the same, as is the case on systems with a
merged /usr directory.

Signed-off-by: Dominic Sacré <[email protected]>
---
 meta/recipes-extended/grep/grep_2.21.bb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/grep/grep_2.21.bb 
b/meta/recipes-extended/grep/grep_2.21.bb
index 3661098..c51147b 100644
--- a/meta/recipes-extended/grep/grep_2.21.bb
+++ b/meta/recipes-extended/grep/grep_2.21.bb
@@ -23,11 +23,13 @@ do_configure_prepend () {
 
 do_install () {
        autotools_do_install
-       install -d ${D}${base_bindir}
-       mv ${D}${bindir}/grep ${D}${base_bindir}/grep
-       mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
-       mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
-       rmdir ${D}${bindir}/
+       if [ "${base_bindir}" != "${bindir}" ]; then
+               install -d ${D}${base_bindir}
+               mv ${D}${bindir}/grep ${D}${base_bindir}/grep
+               mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
+               mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
+               rmdir ${D}${bindir}/
+       fi
 }
 
 inherit update-alternatives
-- 
2.5.2

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to