[Xen-changelog] Resolve merge failure.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1391, 2005/04/28 14:33:33+01:00, mjw@xxxxxxxxxxxxxxxxxxx

        Resolve merge failure.
        Signed-off-by: Mike Wray <mike.wray@xxxxxx>



 Makefile |    2 ++
 1 files changed, 2 insertions(+)


diff -Nru a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile    2005-05-13 16:05:23 -04:00
+++ b/tools/Makefile    2005-05-13 16:05:23 -04:00
@@ -10,7 +10,9 @@
 SUBDIRS += python
 SUBDIRS += xfrd
 SUBDIRS += xcs
+ifndef XEN_NO_IOEMU
 SUBDIRS += ioemu
+endif
 SUBDIRS += pygrub
 
 .PHONY: all install clean check check_clean

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog