From 22591c2ee40bd404465fa3ec7559bd8b3689d6d5 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Mon, 6 Feb 2012 13:33:31 +0000 Subject: [PATCH] libusb1: 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. (From OE-Core rev: 2ada7f7a0fa8a76a9ef7b45b0e0ced78757d9021) Signed-off-by: Mike Crowe Signed-off-by: Richard Purdie --- meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb index 8873de7..e45a9d9 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.8.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" @@ -20,7 +20,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}" do_install_append() { install -d ${D}${libdir} - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi } FILES_${PN} += "${base_libdir}/*.so.*" -- 2.7.4