[tools] m4 is now available, sorry for trouble

[openwrt.git] / toolchain / binutils / Makefile

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index dba6d45..10902df 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -28,12 +28,8 @@ endif
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
 REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
 REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)

-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)

 
 

-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk

 
 BINUTILS_CONFIGURE:= \
        ./configure \
 
 BINUTILS_CONFIGURE:= \
        ./configure \


@@ -61,30 +57,30 @@ ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
                --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
 endif
 
                --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
 endif
 

-define Build/Prepare
-       $(call Build/Prepare/Default)
+define Host/Prepare
+       $(call Host/Prepare/Default)

        ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)

-       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/
+       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/

 endef
 
 endef
 

-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
+define Host/Configure
+       (cd $(HOST_BUILD_DIR); \

                $(BINUTILS_CONFIGURE) \
        );
 endef
 
                $(BINUTILS_CONFIGURE) \
        );
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
+define Host/Compile
+       $(MAKE) -C $(HOST_BUILD_DIR) all

 endef
 
 endef
 

-define Build/Install
-       $(MAKE) -C $(PKG_BUILD_DIR) install
+define Host/Install
+       $(MAKE) -C $(HOST_BUILD_DIR) install

        $(CP) $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
 endef
 
        $(CP) $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
 endef
 

-define Build/Clean
+define Host/Clean

        rm -rf \
        rm -rf \

-               $(PKG_BUILD_DIR) \
+               $(HOST_BUILD_DIR) \

                $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 endef
 
                $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 endef