summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2013-08-22 05:43:58 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-08-22 21:05:43 (GMT)
commit8e2696eab6a781727c09408528678d4d29edd7a3 (patch)
treea06ef4b68bcb855261635b361eadbcf6ba53beea
parenta737dfccd5a05114b03a8a0b127a20a88c8540d7 (diff)
downloadbuildroot-8e2696eab6a781727c09408528678d4d29edd7a3.tar.gz
buildroot-8e2696eab6a781727c09408528678d4d29edd7a3.tar.bz2
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: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 794d217..6018d63 100644
--- a/Makefile
+++ b/Makefile
@@ -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 ; \