DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description...
authorJohn Crispin <john@openwrt.org>
Sun, 14 Oct 2007 04:49:05 +0000 (04:49 +0000)
committerJohn Crispin <john@openwrt.org>
Sun, 14 Oct 2007 04:49:05 +0000 (04:49 +0000)
SVN-Revision: 9307

include/package-defaults.mk
include/package.mk

index 50554b3..d6adb1a 100644 (file)
@@ -30,7 +30,6 @@ define Package/Default
   SUBMENU:=
   SUBMENUDEP:=
   TITLE:=
-  DESCRIPTION:=
   KCONFIG:=
 endef
 
index d90bec8..a981964 100644 (file)
@@ -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)),)