[oe-commits] Phil Blundell : dhcp: don' t try to move files from ${sbindir} to ${base_sbindir} if they are the same

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 70a786ad881607f6312fe80655c79ab81c53996a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=70a786ad881607f6312fe80655c79ab81c53996a

Author: Phil Blundell <pb at pbcl.net>
Date:   Thu Jun 16 14:27:43 2011 +0100

dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the same

Signed-off-by: Phil Blundell <philb at gnu.org>

---

 meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 159ae89..885cc19 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -47,7 +47,9 @@ do_install_append () {
 	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 
 	install -d ${D}${base_sbindir}/
-	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
+	if [ "${sbindir}" != "${base_sbindir}" ]; then
+		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
+	fi
 	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
 }