From f1c9042ee4c42ac81f8846f5eb912f8db48e5c5f Mon Sep 17 00:00:00 2001 From: Dominic Sacré Date: Thu, 17 Sep 2015 18:13:45 +0200 Subject: grep: fix install if bindir == base_bindir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Signed-off-by: Ross Burton --- meta/recipes-extended/grep/grep_2.21.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/recipes-extended') 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 -- cgit 1.2.3-korg