From patchwork Tue Feb  7 22:45:30 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [CONSOLIDATED, PULL,
	10/35] libcap: Cope with ${libdir} and ${base_libdir} being the same
Date: Tue, 07 Feb 2012 22:45:30 -0000
From: Saul Wold <sgw@linux.intel.com>
X-Patchwork-Id: 20947
Message-Id: <bf136334aecc156c73eed76562819351de368eec.1328654424.git.sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org

From: Mike Crowe <mac@mcrowe.com>

${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@mcrowe.com>

---
meta/recipes-support/libcap/libcap.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 9418abf..5b03671 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -12,6 +12,8 @@ DEPENDS_virtclass-native = "perl-native-runtime"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2"
 
+PR = "r1"
+
 inherit lib_package
 
 do_configure() {
@@ -47,8 +49,10 @@ do_install() {
 do_install_append() {
 	# Move the library to base_libdir
 	install -d ${D}${base_libdir}
-	mv ${D}${libdir}/* ${D}${base_libdir}
-	rmdir ${D}${libdir}
+	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+		mv ${D}${libdir}/* ${D}${base_libdir}
+		rmdir ${D}${libdir}
+	fi
 }
 
 FILES_${PN}-dev += "${base_libdir}/*.so"