X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=rules.mk;h=a4dcaa1fcdbd42f1156be727c27d5fa585f55323;hb=e2f8c9d2e4ece49c70665e3c044d35af23d14015;hp=84163ba225218c6d7fd621a27db9de3da2731295;hpb=b8885f1f93a2d6cf32afdf2e59f87a837a0d4de7;p=openwrt-10.03%2F.git diff --git a/rules.mk b/rules.mk index 84163ba22..a4dcaa1fc 100644 --- a/rules.mk +++ b/rules.mk @@ -8,7 +8,8 @@ -include $(TOPDIR)/.config include $(TOPDIR)/include/verbose.mk -export SHELL=/bin/bash +export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- +export BASH=$(shell which bash) ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) @@ -83,6 +84,7 @@ RSTRIP:= \ # where to build (and put) .ipk packages IPKG:= \ + PATH="$(STAGING_DIR)/bin:$(PATH)" \ IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ @@ -104,9 +106,9 @@ ifneq ($(CONFIG_LARGEFILE),y) endif ifeq ($(CONFIG_TAR_VERBOSITY),y) - TAR_OPTIONS=-xvf + TAR_OPTIONS:=-xvf - else - TAR_OPTIONS=-xf + TAR_OPTIONS:=-xf - endif all: