[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5207/8267] mktemp: Move installed files only when needed

[Emmanuele Bassi <ebassi src gnome org>]

commit d582e406ba1b41e7cee69b1bc4af4b389a14ed80
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Wed Feb 8 11:15:17 2017 +0200

    mktemp: Move installed files only when needed
    
    Move binary(ies) only when ${base_bindir} != ${bindir}.
    
    When usrmerge is enabled they both can point to same location.
    
    (From OE-Core rev: 3a571f24b183ba0bb0795b9df2b2c9bad331d715)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/mktemp/mktemp_1.7.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index 9accc6e..e8ae5c6 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -20,9 +20,11 @@ inherit autotools update-alternatives
 EXTRA_OECONF = "--with-libc"
 
 do_install_append () {
-       install -d ${D}${base_bindir}
-       mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
-       rmdir ${D}${bindir}
+       if [ "${base_bindir}" != "${bindir}" ] ; then
+               install -d ${D}${base_bindir}
+               mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
+               rmdir ${D}${bindir}
+       fi
 }
 
 ALTERNATIVE_${PN} = "mktemp"