tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system...

[openwrt.git] / tools / qemu / Makefile

diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 7d4eb0b..c0d587b 100644 (file)
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -7,15 +7,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qemu
-PKG_VERSION:=0.12.5
+PKG_VERSION:=0.13.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/qemu/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=1d02ee0a04dfae2894340273372c1de4
+PKG_MD5SUM:=397a0d665da8ba9d3b9583629f3d6421
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+
 define Host/Configure
        (cd $(HOST_BUILD_DIR); \
                CFLAGS="$(HOST_CFLAGS)" \
@@ -27,9 +29,7 @@ define Host/Configure
 endef
 
 define Host/Compile
-       (cd $(HOST_BUILD_DIR); \
-               make qemu-img \
-       )
+       $(MAKE) -C $(HOST_BUILD_DIR) qemu-img
 endef
 
 define Host/Install