From 84ddc66a410e61c56f2e68e539f7d678ef9abe1a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 5 Dec 2008 15:27:26 +0000
Subject: [PATCH] toolchain/*: use CONFIG_UPDATE

Based on e0e0945e in Bernhard's tree.
---
 package/gmp/gmp.mk              | 2 +-
 package/mpfr/mpfr.mk            | 2 +-
 toolchain/binutils/binutils.mk  | 2 +-
 toolchain/ccache/ccache.mk      | 1 +
 toolchain/elf2flt/elf2flt.mk    | 1 +
 toolchain/gcc/gcc-uclibc-3.x.mk | 2 +-
 toolchain/gdb/gdb.mk            | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 95d8deee3..f221b47bb 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -27,7 +27,7 @@ libgmp-source: $(DL_DIR)/$(GMP_SOURCE)
 $(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE)
 	$(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch
-	$(CONFIG_UPDATE) $(GMP_DIR)
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 7c1febf4b..85fbbd73a 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -30,7 +30,7 @@ $(DL_DIR)/$(MPFR_SOURCE):
 $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
 	$(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch
-	$(CONFIG_UPDATE) $(MPFR_DIR)
+	$(CONFIG_UPDATE) $(@D)
 ifneq ($(MPFR_PATCH),)
 	( cd $(MPFR_DIR); patch -p1 -N -Z < $(MPFR_PATCH_SOURCE); )
 endif
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 46e733448..d1543058b 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -88,7 +88,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
 	rm -rf $(BINUTILS_DIR)
 	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(BINUTILS_DIR)
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 binutils-patched: $(BINUTILS_DIR)/.patched
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index 8b19e68e9..f30823c4d 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -29,6 +29,7 @@ $(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked
 	$(SED) "s,getenv(\"CCACHE_DIR\"),\"$(BR2_CCACHE_DIR)\",g" \
 		$(CCACHE_DIR1)/ccache.c
 	mkdir -p $(CCACHE_DIR1)/cache
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index dd89c0609..640a04a67 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -19,6 +19,7 @@ ifeq ($(strip $(ARCH)),nios2)
 	$(SED) "s,CROSS_COMPILE_PREFIX,$(REAL_GNU_TARGET_NAME),g;" toolchain/elf2flt/elf2flt.nios2.conditional
 	toolchain/patch-kernel.sh $(ELF2FLT_DIR) toolchain/elf2flt elf2flt.nios2.conditional
 endif
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index c585f5338..3f1a3cac4 100644
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -144,7 +144,7 @@ gcc-unpacked: $(GCC_DIR)/.patched
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(GCC_DIR)
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 gcc-patched: $(GCC_DIR)/.patched
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 38ed145c2..d57fd4060 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -58,7 +58,7 @@ ifeq ($(GDB_VERSION),snapshot)
 	ln -sf $(TOOL_BUILD_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
 	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
-	$(CONFIG_UPDATE) $(GDB_DIR)
+	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
 gdb-patched: $(GDB_DIR)/.unpacked