[oe-commits] Mike Crowe : e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 992604c533c9f3c2133cfa87c1121d43a508ec4a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=992604c533c9f3c2133cfa87c1121d43a508ec4a

Author: Mike Crowe <mac at mcrowe.com>
Date:   Thu Feb 16 15:13:35 2012 +0000

e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same

${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.

Signed-off-by: Mike Crowe <mac at mcrowe.com>

---

 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index 2d36f69..6e3f7b8 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4 \
@@ -34,9 +34,11 @@ do_install () {
 
 do_install_append () {
 	# e2initrd_helper and the pkgconfig files belong in libdir
-	install -d ${D}${libdir}
-	mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
-	mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+		install -d ${D}${libdir}
+		mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
+		mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+	fi
 }
 
 # blkid used to be part of e2fsprogs but is useful outside, add it