From patchwork Tue Feb 7 22:45:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 08/35] libusb1: Cope with ${libdir} and ${base_libdir} being the same Date: Tue, 07 Feb 2012 22:45:28 -0000 From: Saul Wold X-Patchwork-Id: 20943 Message-Id: <2ada7f7a0fa8a76a9ef7b45b0e0ced78757d9021.1328654424.git.sgw@linux.intel.com> 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. Signed-off-by: Mike Crowe --- meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 ++++-- 1 files 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.*"