fix everything I broke with the previous patches

[librecmc/librecmc.git] / openwrt / toolchain / uClibc / Makefile

diff --git a/openwrt/toolchain/uClibc/Makefile b/openwrt/toolchain/uClibc/Makefile
index 22c5913457393c0633ee79c2fc830c83541cb1c1..a99c734b92fc3448db04110164c8438ed21a539d 100644 (file)
--- a/openwrt/toolchain/uClibc/Makefile
+++ b/openwrt/toolchain/uClibc/Makefile
@@ -1,4 +1,11 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
 PKG_VERSION:=0.9.28
@@ -29,7 +36,11 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
-       $(CP) ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
+       if [ -e config/$(ARCH).$(BOARD) ]; then \
+               $(CP) config/$(ARCH).$(BOARD) $(PKG_BUILD_DIR)/.config; \
+       else \
+               $(CP) config/$(ARCH) $(PKG_BUILD_DIR)/.config; \
+       fi
        $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
                $(PKG_BUILD_DIR)/.config
 ifeq ($(CONFIG_LARGEFILE),y)
@@ -44,7 +55,7 @@ endif
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
                DEVEL_PREFIX=/usr/ \
                RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -57,7 +68,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX= \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \