X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dda0649ef37ceb08df09c0dbc15f27cbdc8285d5..0dd225201a15d54ac6a166185eb6b8a057ac846d:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index 9f45a441a..9ab3a2cd5 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -19,6 +19,7 @@ include $(INCLUDE_DIR)/depends.mk
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
 
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
@@ -43,12 +44,14 @@ endif
 define Download/default
   FILE:=$(PKG_SOURCE)
   URL:=$(PKG_SOURCE_URL)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
   PROTO:=$(PKG_SOURCE_PROTO)
   VERSION:=$(PKG_SOURCE_VERSION)
   MD5SUM:=$(PKG_MD5SUM)
 endef
 
 define Build/DefaultTargets
+  $(if $(QUILT),$(Build/Quilt))
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
   $(call Build/Autoclean)
 
@@ -64,29 +67,36 @@ define Build/DefaultTargets
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
 	$(Build/Compile)
-	$(call Build/InstallDev,$(STAGING_DIR))
+	touch $$@
+
+  $(STAMP_INSTALLED): $(STAMP_BUILT)
+	$(call Build/InstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
 	touch $$@
 
   ifdef Build/InstallDev
-    compile: $(STAMP_BUILT)
+    compile: $(STAMP_INSTALLED)
   endif
 
   define Build/DefaultTargets
   endef
+
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)
 endef
 
 define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-# <HACK> Support obsolete DESCRIPTION field
+ifdef DESCRIPTION
+$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description)
+endif
+
 ifndef Package/$(1)/description
 define Package/$(1)/description
-$(TITLE)$(subst \,
-,\ $(DESCRIPTION))
+	$(TITLE)
 endef
 endif
-# </HACK>
 
   $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)
@@ -120,6 +130,14 @@ define libtool_fixup_libdir
 		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
 endef
 
+define pkg_install_files
+	$(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
+endef
+
+define pkg_install_bin
+	$(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;)
+endef
+
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
@@ -137,12 +155,12 @@ $(PACKAGE_DIR):
 		
 dumpinfo:
 download:
-prepare: $(STAMP_PREPARED)
-configure: $(STAMP_CONFIGURED)
+prepare:
+configure:
 compile:
 install:
 clean: FORCE
-	$(call Build/UninstallDev,$(STAGING_DIR))
+	$(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
 	$(Build/Clean)
 	@rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
 	@rm -rf $(PKG_BUILD_DIR)