summaryrefslogtreecommitdiff
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2012-02-06 13:42:36 +0000
committerSaul Wold <sgw@linux.intel.com>2012-02-07 14:37:13 -0800
commiteadcd9708a2b363295b3b8a9159972ca4100fc51 (patch)
treefeade21aa4d181ecfeeea6077153d3ba6d91898c /meta/recipes-support
parent2ada7f7a0fa8a76a9ef7b45b0e0ced78757d9021 (diff)
downloadopenembedded-core-eadcd9708a2b363295b3b8a9159972ca4100fc51.tar.gz
openembedded-core-eadcd9708a2b363295b3b8a9159972ca4100fc51.tar.bz2
openembedded-core-eadcd9708a2b363295b3b8a9159972ca4100fc51.tar.xz
openembedded-core-eadcd9708a2b363295b3b8a9159972ca4100fc51.zip
libusb-compat: 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.
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libusb/libusb-compat_0.1.3.bb6
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 60ebcc20f..1595a2994 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"