Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

diff --git a/lfs/glibc b/lfs/glibc
index dcbffc254260d798a852224844f6d26adfe04fa8..f0d8aba647caeda0d2d636c4ab7f7e84bb51954a 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -298,8 +298,7 @@ endif
 ifeq "$(ROOT)" ""
        # Creating the locales
        mkdir -p /usr/lib/locale
-       cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US
-       cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8      en_US.utf8
+       cd $(DIR_SRC)/glibc-build && make localedata/install-locales
 
        # Timezone data will be shipped by tzdata.
        rm -rfv /usr/share/zoneinfo