X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=4a0fa32e3554b124a5d687825220224df8558dc0;hb=166bbb961a7da0838704d07e281164c7265e3872;hp=9f1c4c474970705c978b5a612bdd98c413f98662;hpb=d1c6cde9423b049f7013cbadb863c6ff72f76e47;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/rules.mk b/rules.mk
index 9f1c4c4749..4a0fa32e35 100644
--- a/rules.mk
+++ b/rules.mk
@@ -23,7 +23,7 @@ $(strip $(subst ",,$(1)))
 endef
 #"))
 
-ARCH:=$(call qstrip,$(CONFIG_ARCH))
+ARCH:=$(call qstrip,$(shell echo $(CONFIG_ARCH) | sed -e 's/i[3-9]86/i386/'))
 BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
 TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
 BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX))
@@ -32,7 +32,7 @@ SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
 
 OPTIMIZE_FOR_CPU:=$(ARCH)
 
-DL_DIR:=$(TOPDIR)/dl
+DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)
 BIN_DIR:=$(TOPDIR)/bin
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
@@ -62,6 +62,12 @@ TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
 TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
 
 export PATH:=$(TARGET_PATH)
+export STAGING_DIR
+export GCC_HONOUR_COPTS:=0
+
+PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
+
+export PKG_CONFIG
 
 LINUX_HEADERS_DIR:=$(BUILD_DIR_TOOLCHAIN)/linux
 
@@ -132,6 +138,10 @@ $(call shvar,$(1))=$$(call $(1))
 export $(call shvar,$(1))
 endef
 
+define confvar
+$(foreach v,$(1),$(if $($(v)),y,n))
+endef
+
 # file extension
 ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1)))