X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e5105e61c1ddbd66161e6a10472f9c730c74d7a4..5a0b9e8c8de29b8fc1c76d7d07a83a35864d471b:/rules.mk diff --git a/rules.mk b/rules.mk index a4dcaa1fc..a59346848 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 @@ -59,6 +58,10 @@ PATCH:=$(SCRIPT_DIR)/patch-kernel.sh SED:=$(STAGING_DIR)/bin/sed -i -e CP:=cp -fpR +INSTALL_BIN:=install -m0755 +INSTALL_DIR:=install -d -m0755 +INSTALL_DATA:=install -m0644 + ifneq ($(CONFIG_CCACHE),) # FIXME: move this variable to a better location export CCACHE_DIR=$(STAGING_DIR)/ccache @@ -111,6 +114,16 @@ else 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