[oe-commits] Phil Blundell : bluez-utils: don' t blow up if ${base_sbindir} is same as ${sbindir}

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d047ea450460173217152b00469d140e83922cfc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d047ea450460173217152b00469d140e83922cfc

Author: Phil Blundell <philb at gnu.org>
Date:   Sun Oct 19 22:00:00 2008 +0100

bluez-utils: don't blow up if ${base_sbindir} is same as ${sbindir}

---

 packages/bluez/bluez-utils3.inc |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index 0bbba2c..c4debd0 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -76,9 +76,14 @@ OE_LT_RPATH_ALLOW[export]="1"
 
 do_install_append() {
 	install -d ${D}${base_sbindir} ${D}${base_bindir}/  ${D}${sysconfdir}/apm/event.d/
-	mv ${D}${sbindir}/* ${D}${base_sbindir}/
-	mv ${D}${bindir}/* ${D}${base_bindir}/
-	rmdir ${D}${bindir} ${D}${sbindir}
+	if [ "${sbindir}" != "${base_sbindir}" ]; then
+		mv ${D}${sbindir}/* ${D}${base_sbindir}/
+		rmdir ${D}${sbindir}
+	fi
+	if [ "${bindir}" != "${base_bindir}" ]; then
+		mv ${D}${bindir}/* ${D}${base_bindir}/
+		rmdir ${D}${bindir}
+	fi
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
         install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/