diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-11-26 22:32:12 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-11-26 22:32:12 +0000 |
| commit | 007d3ad28aa0f1f84f7e5103f814ec57c9adebfd (patch) | |
| tree | 38d5c72b61e3c17562a51133ee49998863fb90a1 /glib-zip.in | |
| parent | 13195ef83661c6667bf6e638da028fdcaa412a4f (diff) | |
| download | glib-007d3ad28aa0f1f84f7e5103f814ec57c9adebfd.tar.gz | |
Use either lib/locale or share/locale depending on which one is in
2007-11-27 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (_glib_get_locale_dir) [Win32]: Use either
lib/locale or share/locale depending on which one is in
GLIB_LOCALE_DIR. When the configury recognizes GNU gettext (based
on the _nl_msg_cat_cntr variable, eek), share/locale gets used.
* glib-zip.in: Likewise, look for message catalogs either in
lib/locale or share/locale.
svn path=/trunk/; revision=5944
Diffstat (limited to 'glib-zip.in')
| -rwxr-xr-x | glib-zip.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/glib-zip.in b/glib-zip.in index 9ca1e0b5d..d50f831f4 100755 --- a/glib-zip.in +++ b/glib-zip.in @@ -16,7 +16,6 @@ cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@ rm $ZIP zip $ZIP -@ <<EOF -COPYING.LIB-2 bin/gspawn-win32-helper.exe bin/gspawn-win32-helper-console.exe bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll @@ -25,7 +24,17 @@ bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll EOF -zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo +if [ -f lib/locale/de/LC_MESSAGES/glib20.mo -a -f share/locale/de/LC_MESSAGES/glib20.mo ]; then + if [ lib/locale/de/LC_MESSAGES/glib20.mo -nt share/locale/de/LC_MESSAGES/glib20.mo ]; then + zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo + else + zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo + fi +elif [ -f lib/locale/de/LC_MESSAGES/glib20.mo ]; then + zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo +else + zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo +fi zip -r $ZIP share/doc/glib-@GLIB_VERSION@ |