libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
authorMike Crowe <mac@mcrowe.com>
Mon, 6 Feb 2012 13:42:36 +0000 (13:42 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Feb 2012 00:50:23 +0000 (00:50 +0000)
${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>
meta/recipes-support/libusb/libusb-compat_0.1.3.bb

index 60ebcc2..1595a29 100644 (file)
@@ -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"