From patchwork Tue Feb 7 22:45:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 09/35] libusb-compat: Cope with ${libdir} and ${base_libdir} being the same Date: Tue, 07 Feb 2012 22:45:29 -0000 From: Saul Wold X-Patchwork-Id: 20945 Message-Id: To: openembedded-core@lists.openembedded.org From: Mike Crowe ${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves. --- meta/recipes-support/libusb/libusb-compat_0.1.3.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb index 60ebcc2..1595a29 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb @@ -15,7 +15,7 @@ DEPENDS = "libusb1" PROVIDES = "libusb" PE = "1" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ file://0.1.0-beta1-gcc3.4-fix.patch" @@ -29,7 +29,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}-dev += "${base_libdir}/*.so"