aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-09-17 18:13:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-21 15:20:05 +0100
commitf1c9042ee4c42ac81f8846f5eb912f8db48e5c5f (patch)
tree790ee81fd0c8d34ed3b69048a099586fe5553228 /meta
parentf9d676757af3a1ca9241a36c0310d6af56578fff (diff)
downloadopenembedded-core-contrib-f1c9042ee4c42ac81f8846f5eb912f8db48e5c5f.tar.gz
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@gmx.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/grep/grep_2.21.bb12
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 3661098c51d..c51147b5744 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