From 7558f0281fe69414821289db83750fbec3e36d3f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 14 Oct 2007 04:49:05 +0000 Subject: [PATCH] DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description is set SVN-Revision: 9307 --- include/package-defaults.mk | 1 - include/package.mk | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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))) -# 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 -# $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),)