X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=luci.mk;h=cc39c0f4c8eb62086f8fdb1762e06d1a976cb357;hp=1ddb73d49868d3d0d2484b337db31dbefcc498e5;hb=83a59dc0f74ad5da70a087c18533472742b236cc;hpb=d40a939d65397580ceb7209d9c1ba01a396c6220 diff --git a/luci.mk b/luci.mk index 1ddb73d49..cc39c0f4c 100644 --- a/luci.mk +++ b/luci.mk @@ -7,7 +7,7 @@ LUCI_NAME?=$(notdir ${CURDIR}) LUCI_TYPE?=$(word 2,$(subst -, ,$(LUCI_NAME))) LUCI_BASENAME?=$(patsubst luci-$(LUCI_TYPE)-%,%,$(LUCI_NAME)) -LUCI_LANGUAGES:=$(filter-out templates,$(notdir $(wildcard ${CURDIR}/po/*))) +LUCI_LANGUAGES:=$(sort $(filter-out templates,$(notdir $(wildcard ${CURDIR}/po/*)))) LUCI_DEFAULTS:=$(notdir $(wildcard ${CURDIR}/root/etc/uci-defaults/*)) LUCI_PKGARCH?=$(if $(realpath src/Makefile),,all) @@ -96,6 +96,7 @@ define Package/$(PKG_NAME) 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:=$(LUCI_DEPENDS) + $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS)) $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH)) endef