[oe-commits] =?UTF-8?Q?Dominic=20Sacr=C3=A9=20?=: grep: fix install if bindir == base_bindir

[git at git.openembedded.org]

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

Author: Dominic Sacré <dominic.sacre at gmx.de>
Date:   Thu Sep 17 18:13:45 2015 +0200

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.

Signed-off-by: Dominic Sacré <dominic.sacre at gmx.de>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 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