From: Amarnath Valluri <amarnath.valluri@intel.com>
Date: Wed, 8 Feb 2017 09:15:17 +0000 (+0200)
Subject: mktemp: Move installed files only when needed
X-Git-Tag: yocto-4.0~17518
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a571f24b183ba0bb0795b9df2b2c9bad331d715;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
---

diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index 9accc6eed69..e8ae5c6b724 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"