diff options
| author | planetmaker <planetmaker@openttd.org> | 2013-07-30 22:03:36 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2013-07-30 22:03:36 +0000 |
| commit | 19d393bda15e05397af4d31220538c3c891996c3 (patch) | |
| tree | aede3edff97dfd88148f4bd995499567f56898f3 | |
| parent | ca1c79214475c5d3acc0f69fb70b44347dc29b57 (diff) | |
| download | openttd-19d393bda15e05397af4d31220538c3c891996c3.tar.xz | |
(svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one
| -rw-r--r-- | bin/baseset/no_music.obm | 2 | ||||
| -rw-r--r-- | bin/baseset/no_sound.obs | 2 | ||||
| -rw-r--r-- | config.lib | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/baseset/no_music.obm b/bin/baseset/no_music.obm index b7d89350f..ba792f134 100644 --- a/bin/baseset/no_music.obm +++ b/bin/baseset/no_music.obm @@ -21,7 +21,7 @@ description.el_GR = Ένα πάκετο μουσικής χωρίς πραγμα description.en_AU = A music pack without actual music. description.en_US = A music pack without actual music. description.es_ES = Un conjunto de música vacío. -description.et_EE = Muusikakomplekt ilma igasuguse muusikata. +description.et_EE = Muusikakogu ilma muusikata. description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia. description.fr_FR = Un pack de musiques sans musiques. description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith. diff --git a/bin/baseset/no_sound.obs b/bin/baseset/no_sound.obs index 33af27473..0458284d1 100644 --- a/bin/baseset/no_sound.obs +++ b/bin/baseset/no_sound.obs @@ -21,7 +21,7 @@ description.el_GR = Ένα πάκετο ήχων χώρις ήχους. description.en_AU = A sound pack without any sounds. description.en_US = A sound pack without any sounds. description.es_ES = Un conjunto de sonidos vacío. -description.et_EE = Ilma häälteta helipakk. +description.et_EE = Helikogu ilma helideta. description.fi_FI = Äänipaketti, jossa ei ole ääniä. description.fr_FR = Un pack de sons sans sons. description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith. diff --git a/config.lib b/config.lib index dec0dc3a7..1f0d4f504 100644 --- a/config.lib +++ b/config.lib @@ -1718,9 +1718,9 @@ make_cflags_and_ldflags() { # Some icu-configs have the 'feature' of not adding a space where others do add the space if [ "$static_icu" != "0" ]; then - LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly --ldflags-layout | tr '\n\r' ' ' | sed s/licu/lsicu/g`" + LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' ' ' | sed s/licu/lsicu/g`" else - LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly --ldflags-layout | tr '\n\r' ' '`" + LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' ' '`" fi fi |