diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-14 04:49:05 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-14 04:49:05 +0000 |
| commit | 525838efb5328c49f8623781375a09a29b2b5878 (patch) | |
| tree | 6765143d22430ce877e38cade5bf91ae5ce2fcea | |
| parent | be51d215c7d4cb5febbd4968fc695496197e17a0 (diff) | |
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.mk | 1 | ||||
| -rw-r--r-- | include/package.mk | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 50554b3df..d6adb1a17 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 d90bec887..a9819642d 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)),) |