work around a make bug in define/endef handling

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index fb963ab..4f0f49e 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,21 +1,30 @@
+ifeq ($(DUMP),)
 include $(TOPDIR)/.config
+endif
+
 SHELL=/bin/bash
 export SHELL
 
 ifeq ($(V),)
-V=99
+V=5
 endif
 
 
 ifneq ($(V),0)
 TRACE:=echo "---> "
+START_TRACE:=echo -n "---> "
+END_TRACE:=echo
 else
+START_TRACE:=:
+END_TRACE:=:
 TRACE:=:
 endif
 
 ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},)
+CMD_TRACE:=:
 PKG_TRACE:=:
 else
+CMD_TRACE:=echo -n
 PKG_TRACE:=echo "------> "
 endif
 
@@ -27,8 +36,12 @@ MAKE_TRACE:=
 EXTRA_MAKEFLAGS:=
 TRACE:=:
 PKG_TRACE:=:
+CMD_TRACE:=:
+START_TRACE:=:
+END_TRACE:=:
 endif
 
+CP=cp -fpR
 MAKE1=make
 MAKEFLAGS=-j$(BR2_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS)
 # Strip off the annoying quoting
@@ -131,7 +144,7 @@ endif
 IPKG_BUILD := PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root
 # where to build (and put) .ipk packages
 IPKG_TARGET_DIR := $(PACKAGE_DIR)
-IPKG:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+IPKG:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc IPKG_OFFLINE_ROOT=$(BUILD_DIR)/root $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
 
 RSTRIP:=STRIP="$(STRIP)" $(SCRIPT_DIR)/rstrip.sh