From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 10 Jan 2015 22:36:26 +0000 (+0100)
Subject: build: rework language dependencies
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=1ce2d8f46af0673068a8057dbeb76af9c477ad55;hp=c5477f717dd50a9a2c87fa7f0cc0cbc03a2047cc

build: rework language dependencies

Rework the language package dependencies to avoid introducing unnecessary
depends. The luci-i18n-$app-$lang packages now depend on luci-$app.

 * When a language is selected as <*> then the language packs for each
   enabled LuCI module are built into the image
 * When a language is selected as <m> then the language packs for each
   enabled LuCI module are built as package
 * When CONFIG_ALL is set (e.g. release builds, snapshots) then all
   language packs are built

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---

diff --git a/luci.mk b/luci.mk
index 1efae9a1f..61f0fbf62 100644
--- a/luci.mk
+++ b/luci.mk
@@ -79,7 +79,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=LuCI
   SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
   TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
-  DEPENDS:=$(foreach lang,$(LUCI_LANGUAGES),+LUCI_LANG_$(lang):luci-i18n-$(LUCI_BASENAME)-$(lang)) $(LUCI_DEPENDS)
+  DEPENDS:=$(LUCI_DEPENDS)
 endef
 
 ifneq ($(LUCI_DESCRIPTION),)
@@ -179,7 +179,12 @@ define LuciTranslation
     CATEGORY:=LuCI
     TITLE:=$(PKG_NAME) - $(1) translation
     HIDDEN:=1
-    DEFAULT:=m if ALL||LUCI_LANG_$(1)
+    DEFAULT:=LUCI_LANG_$(1)||ALL
+    DEPENDS:=$(PKG_NAME)
+  endef
+
+  define Package/luci-i18n-$(LUCI_BASENAME)-$(1)/description
+    $(LUCI_LANG.$(1))
   endef
 
   define Package/luci-i18n-$(LUCI_BASENAME)-$(1)/install