From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Oct 2007 04:49:05 +0000 (+0000)
Subject: DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description... 
X-Git-Tag: fast2504n-3.10.28-merged~20032
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=525838efb5328c49f8623781375a09a29b2b5878;p=openwrt.git

DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description is set

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9307 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 50554b3df5..d6adb1a17a 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -30,7 +30,6 @@ define Package/Default
   SUBMENU:=
   SUBMENUDEP:=
   TITLE:=
-  DESCRIPTION:=
   KCONFIG:=
 endef
 
diff --git a/include/package.mk b/include/package.mk
index d90bec8872..a9819642dd 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -80,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)),)