summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2012-02-06 13:42:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 00:50:23 +0000
commitf2b55ac3912562ccb1271c528106485394574898 (patch)
tree8a3a1786b737695f4efbff3d3c86c5b4bb432177 /meta
parent83dcff4042c563a10cf725086114611a145006fb (diff)
downloadpoky-f2b55ac3912562ccb1271c528106485394574898.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 60ebcc20f2..1595a2994e 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"
15PROVIDES = "libusb" 15PROVIDES = "libusb"
16 16
17PE = "1" 17PE = "1"
18PR = "r2" 18PR = "r3"
19 19
20SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ 20SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
21 file://0.1.0-beta1-gcc3.4-fix.patch" 21 file://0.1.0-beta1-gcc3.4-fix.patch"
@@ -29,7 +29,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}"
29 29
30do_install_append() { 30do_install_append() {
31 install -d ${D}${libdir} 31 install -d ${D}${libdir}
32 mv ${D}${base_libdir}/pkgconfig ${D}${libdir} 32 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
33 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
34 fi
33} 35}
34 36
35FILES_${PN}-dev += "${base_libdir}/*.so" 37FILES_${PN}-dev += "${base_libdir}/*.so"