X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=tools%2FMakefile;h=fc3b2e175d1b21a12bbea77af94b31e17f7ea475;hp=492c02709909a937becb4f0ee497a6f3b78a5eb4;hb=c91626b9ab84ef031b3f2315b713cf476ae2c1c8;hpb=974d084f9dd2e51c3487a75e29f23411a2cfb242

diff --git a/tools/Makefile b/tools/Makefile
index 492c02709..fc3b2e175 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,21 +9,25 @@
 curdir:=tools
 
 # subdirectories to descend into
-$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
+$(curdir)/builddirs := sed sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache)
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # preparatory work
-define copy_include
-$(STAGING_DIR)/include-host/.done:
-	@mkdir -p $$$$(dirname $$@)
-	@cp $(1)/include/*.h $$$$(dirname $$@)/
-	@touch $$@
-$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
-$(curdir)//compile = $(STAGING_DIR)/include-host/.done
-endef
-$(eval $(call copy_include,$(curdir)))
+$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
+	@for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \
+		set -x; \
+		mkdir -p "$$dir"; \
+		cd "$$dir"; \
+		mkdir -p bin lib include stamp; \
+	); done
+	mkdir -p $(BUILD_DIR_HOST)/stamp $(BUILD_DIR)/stamp
+	$(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/
+	touch $@
+
+$(curdir)//prepare = $(STAGING_DIR)/.prepared
+$(curdir)//compile = $(STAGING_DIR)/.prepared
 
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq