Commit 8e2696ea authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Thomas Petazzoni
Browse files

generatelocales: fix 'cut' invocation 



'cut' needs to be invoked with the -s option to make sure it doesn't
print anything when the delimiter isn't found. This is particularly
important for the charmap detection, because UTF-8 is appended if
the charmap is empty. But without -s, it will never be empty.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a737dfcc

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -543,8 +543,8 @@ ifneq ($(GENERATE_LOCALE),) 
target-generatelocales: host-localedef

	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/

	$(Q)for locale in $(GENERATE_LOCALE) ; do \

		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \

		charmap=`echo $${locale} | cut -f2 -d'.'` ; \

		inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \

		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \

		if test -z "$${charmap}" ; then \

			charmap="UTF-8" ; \

		fi ; \