allow concurrent use of host-build.mk and package.mk as well as their templates

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 0f3d21e..2b28b64 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -27,11 +27,12 @@ include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
+include $(INCLUDE_DIR)/package-debug.mk
 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 ifneq ($(CONFIG_LINUX_2_4),)
   CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
 endif
@@ -68,7 +69,7 @@ define Build/DefaultTargets
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
   $(call Build/Autoclean)
 
-  $(STAMP_PREPARED):
+  $(STAMP_PREPARED): $(HOST_STAMP_INSTALLED)
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)
        $(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep))
@@ -124,7 +125,7 @@ define BuildPackage
   $(eval $(Package/$(1)))
 
 ifdef DESCRIPTION
-$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description)
+$$(error DESCRIPTION:= is obsolete, use Package/PKG_NAME/description)
 endif
 
 ifndef Package/$(1)/description
@@ -146,7 +147,7 @@ endif
     $(Dumpinfo), \
     $(foreach target, \
       $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
-        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg ) \
+        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg $(if $(CONFIG_DEBUG_DIR),debug)) \
       ), $(BuildTarget/$(target)) \
     ) \
   )