aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2007-10-14 04:49:05 +0000
committerJohn Crispin <blogic@openwrt.org>2007-10-14 04:49:05 +0000
commit8c3f16c2595f48e3ebf5e0beac0a8c529ed44d07 (patch)
tree6765143d22430ce877e38cade5bf91ae5ce2fcea
parent053be4938471adf2613631684c5f2adac611ad6a (diff)
downloadmaster-187ad058-8c3f16c2595f48e3ebf5e0beac0a8c529ed44d07.tar.gz
master-187ad058-8c3f16c2595f48e3ebf5e0beac0a8c529ed44d07.tar.bz2
master-187ad058-8c3f16c2595f48e3ebf5e0beac0a8c529ed44d07.zip
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
-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)),)