aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2007-10-14 04:49:05 +0000
committerJohn Crispin <john@openwrt.org>2007-10-14 04:49:05 +0000
commit7558f0281fe69414821289db83750fbec3e36d3f (patch)
tree85acc5ad55ddb20b3f291fcd823483419cebc2bd /include
parent92c40922e97b92f670d70cea5082a95e25c0423a (diff)
downloadupstream-7558f0281fe69414821289db83750fbec3e36d3f.tar.gz
upstream-7558f0281fe69414821289db83750fbec3e36d3f.tar.bz2
upstream-7558f0281fe69414821289db83750fbec3e36d3f.zip
DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description is set
SVN-Revision: 9307
Diffstat (limited to 'include')
-rw-r--r--include/package-defaults.mk1
-rw-r--r--include/package.mk9
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)))
-# <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)),)