X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=d52539f3f2b80b0d6a5fd1521a31685720570104;hb=85668687d84405d3889aa7ffb01d16db48990070;hp=96a54c9fea832d20a4c22d95bea8e68d3f10d28b;hpb=571d37fe94f40eb630cee1d81151122038513a48;p=openwrt.git diff --git a/rules.mk b/rules.mk index 96a54c9fea..d52539f3f2 100644 --- a/rules.mk +++ b/rules.mk @@ -9,7 +9,6 @@ include $(TOPDIR)/include/verbose.mk 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))) @@ -30,7 +29,7 @@ BIN_DIR:=$(TOPDIR)/bin PACKAGE_DIR:=$(BIN_DIR)/packages IPKG_TARGET_DIR:=$(PACKAGE_DIR) BUILD_DIR:=$(TOPDIR)/build_$(ARCH) -TMP_DIR:=$(BUILD_DIR)/tmp +TMP_DIR:=$(TOPDIR)/tmp STAMP_DIR:=$(BUILD_DIR)/stamp TARGET_DIR:=$(BUILD_DIR)/root IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg @@ -106,11 +105,21 @@ ifneq ($(CONFIG_LARGEFILE),y) endif ifeq ($(CONFIG_TAR_VERBOSITY),y) - TAR_OPTIONS=-xvf - + TAR_OPTIONS:=-xvf - else - TAR_OPTIONS=-xf - + TAR_OPTIONS:=-xf - endif +define shvar +V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) +endef + +define shexport +$(call shvar,$(1))=$$(call $(1)) +export $(call shvar,$(1)) +endef + + all: FORCE: ; .PHONY: FORCE