diff options
author | Mike Crowe <mac@mcrowe.com> | 2012-02-06 13:33:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:23 +0000 |
commit | 83dcff4042c563a10cf725086114611a145006fb (patch) | |
tree | a83caf155d632e61cea327f2df5edde6bc7ec0b6 | |
parent | e33f828d88fa650585723ef9b00d464d13e26554 (diff) | |
download | poky-83dcff4042c563a10cf725086114611a145006fb.tar.gz |
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 <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | 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 8873de745a..e45a9d9ae3 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" | |||
6 | LICENSE = "LGPLv2.1+" | 6 | LICENSE = "LGPLv2.1+" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" |
8 | 8 | ||
9 | PR = "r2" | 9 | PR = "r3" |
10 | 10 | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" |
12 | 12 | ||
@@ -20,7 +20,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}" | |||
20 | 20 | ||
21 | do_install_append() { | 21 | do_install_append() { |
22 | install -d ${D}${libdir} | 22 | install -d ${D}${libdir} |
23 | mv ${D}${base_libdir}/pkgconfig ${D}${libdir} | 23 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then |
24 | mv ${D}${base_libdir}/pkgconfig ${D}${libdir} | ||
25 | fi | ||
24 | } | 26 | } |
25 | 27 | ||
26 | FILES_${PN} += "${base_libdir}/*.so.*" | 28 | FILES_${PN} += "${base_libdir}/*.so.*" |