X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e82554c4f9a898abdf540188bd69086958c9410..b40bc2899b2e399c07e4b0b1dda0f9cfcb9c8b5a:/include/package.mk?ds=sidebyside diff --git a/include/package.mk b/include/package.mk index 7cfe69793..9f7cfc855 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) +STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) STAMP_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed @@ -26,15 +26,11 @@ 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/$(REAL_GNU_TARGET_NAME) -ifneq ($(CONFIG_LINUX_2_4),) - CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE)) -endif CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE)) @@ -176,10 +172,10 @@ endif $(call shexport,Package/$(1)/config) $(if $(DUMP), \ - $(Dumpinfo), \ + $(Dumpinfo/Package), \ $(foreach target, \ $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \ - $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg $(if $(CONFIG_DEBUG_DIR),debug)) \ + $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \ ), $(BuildTarget/$(target)) \ ) \ )