X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/900c05f6e102b84281efcd2fc5297b72d9253ba7..046898ae1ce9bff7b43870b59c4a5eea4aba9980:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index bf82c6045..7ae0c6a25 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -25,6 +25,7 @@ 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-bin.mk
 
 override MAKEFLAGS=
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
@@ -48,6 +49,7 @@ define Download/default
 endef
 
 define Build/DefaultTargets
+  $(if $(QUILT),$(Build/Quilt))
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
   $(call Build/Autoclean)
 
@@ -78,14 +80,15 @@ 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)),)
@@ -119,6 +122,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_file)`; $(INSTALL_BIN) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
+endef
+
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef