]> code.ossystems Code Review - openembedded-core.git/commitdiff
grep: fix install if bindir == base_bindir
authorDominic Sacré <dominic.sacre@gmx.de>
Thu, 17 Sep 2015 16:13:45 +0000 (18:13 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 21 Sep 2015 14:20:05 +0000 (15:20 +0100)
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>
meta/recipes-extended/grep/grep_2.21.bb

index 3661098c51dd77abb1746104e9df1af859e23443..c51147b574420e58334f1793ca1a0ca8fde2aaf3 100644 (file)
@@ -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