From: Hannu Nyman Date: Mon, 23 Oct 2017 15:30:56 +0000 (+0300) Subject: Merge pull request #1296 from TDT-GmbH/sort-language X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=3e00e13e1f2a2518de9e14090384f75b94329d98;hp=59a4e4065d7ba5711028e03de0f05a60f7130e23 Merge pull request #1296 from TDT-GmbH/sort-language luci.mk: sort languages in lexical order --- diff --git a/luci.mk b/luci.mk index 1ddb73d49..0b2ec4e70 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)