From bce5d25923fa12b78995d41278ed940869221feb Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 27 Nov 2014 02:53:36 -0500 Subject: sed: test bindir and base_bindir before moving and removing things It's possible that ${base_bindir} and ${bindir} point to the same directory. So we need to test it before moving things around or removing things. Signed-off-by: Chen Qi --- meta/recipes-extended/sed/sed_4.1.2.bb | 6 ++++-- meta/recipes-extended/sed/sed_4.2.2.bb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index fe242e16bd..a2bcb7d75a 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb @@ -23,8 +23,10 @@ do_configure_prepend () { do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ "${bindir}" != "${base_bindir}" ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb index ea39dae435..1c49c12969 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.2.2.bb @@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \ do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ "${bindir}" != "${base_bindir}" ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" -- cgit 1.2.3-korg