grep: fix install if bindir == base_bindir

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.

(From OE-Core rev: f1c9042ee4c42ac81f8846f5eb912f8db48e5c5f)

Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files 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 3661098c51..c51147b574 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