From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Fri, 27 Mar 2009 16:46:57 +0000 (+0000)
Subject: ioemu directory is always at tools/ioemu-dir
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c91b11ecd95d5707a91122ee59e903ea379a78b8;p=xenclient%2Fxen.git

ioemu directory is always at tools/ioemu-dir
---

diff --git a/tools/Makefile b/tools/Makefile
index eec3527..d5d9228 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -70,30 +70,9 @@ subdir-clean-ioemu:
 	$(MAKE) -C ioemu distclean
 
 ioemu-dir-find:
-	set -ex; \
-	if test -d $(CONFIG_QEMU); then \
-		rm -f ioemu-dir; \
-		ln -sf $(CONFIG_QEMU) ioemu-dir; \
-	else \
-		if [ ! -d ioemu-remote ]; then \
-			rm -rf ioemu-remote ioemu-remote.tmp; \
-			mkdir ioemu-remote.tmp; rmdir ioemu-remote.tmp; \
-			$(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
-			if [ "$(QEMU_TAG)" ]; then			\
-				cd ioemu-remote.tmp;			\
-				$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
-				$(GIT) checkout -b dummy $(QEMU_TAG);	\
-				cd ..;					\
-			fi;						\
-			mv ioemu-remote.tmp ioemu-remote; \
-		fi; \
-		rm -f ioemu-dir; \
-		ln -sf ioemu-remote ioemu-dir; \
-	fi
-	set -e; \
-		$(absolutify_xen_root); \
-		cd ioemu-dir; \
-		STAGING_ROOT=$(STAGING_ROOT) ./xen-setup $(IOEMU_CONFIGURE_CROSS)
+	$(absolutify_xen_root); \
+	cd ioemu-dir; \
+	STAGING_ROOT=$(STAGING_ROOT) ./xen-setup $(IOEMU_CONFIGURE_CROSS)
 
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find