From: John Crispin <john@openwrt.org>
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: reboot~27828
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7558f0281fe69414821289db83750fbec3e36d3f;p=openwrt%2Fstaging%2Fblogic.git

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

SVN-Revision: 9307
---

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 50554b3df514..d6adb1a17a01 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 d90bec887252..a9819642dd5f 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)),)