diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-11-28 01:06:07 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-11-28 01:06:07 +0000 |
| commit | 10825b14b8964337f84769f10d799a281666e4c1 (patch) | |
| tree | 4999fb7042538cfe29b90b96f7c6279dedb8e33a /gtk-zip.sh.in | |
| parent | 2159f9c7ca302ae1ef1749a6db4464388de5896d (diff) | |
| download | gtk+-10825b14b8964337f84769f10d799a281666e4c1.tar.gz | |
A proper build of GNU libintl is supposed to export the variable
2007-11-28 Tor Lillqvist <tml@novell.com>
A proper build of GNU libintl is supposed to export the variable
_nl_msg_cat_cntr. configure looks for that variable in order to
recognize GNU gettext. If it sees that it is indeed GNU gettext
that is used, it decides to install message catalogs in
share/locale, otherwise in lib/locale. Until now on Windows I have
built GTK+ against a build of GNU gettext that did not export
_nl_msg_cat_cntr. But this will change, so we can't assume message
catalogs are always in lib/locale.
* gtk/gtkmain.c: (_gtk_get_localedir) [Win32]: Rework to handle
GTK_LOCALEDIR being either in "lib" or "share". Move the function
before the inclusion of gtkprivate.h so that it sees the original
GTK_LOCALEDIR.
* gtk-zip.sh.in: Check whether the message catalogs are in
share/locale or lib/locale.
svn path=/trunk/; revision=19083
Diffstat (limited to 'gtk-zip.sh.in')
| -rwxr-xr-x | gtk-zip.sh.in | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in index f32c10e3e4..8cd89a90f2 100755 --- a/gtk-zip.sh.in +++ b/gtk-zip.sh.in @@ -14,7 +14,6 @@ cp -p @abs_srcdir@/COPYING share/doc/gtk+-dev-@GTK_VERSION@ rm $ZIP zip $ZIP -@ <<EOF -COPYING.LIB-2 etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtkrc etc/gtk-2.0/gtk.immodules @@ -32,8 +31,21 @@ zip $ZIP share/themes/Default/gtk-2.0-key/gtkrc zip $ZIP share/themes/Emacs/gtk-2.0-key/gtkrc zip $ZIP share/themes/MS-Windows/gtk-2.0/gtkrc -zip $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo -zip $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo +if [ -f lib/locale/de/LC_MESSAGES/gtk20.mo -a -f share/locale/de/LC_MESSAGES/gtk20.mo ]; then + if [ lib/locale/de/LC_MESSAGES/gtk20.mo -nt share/locale/de/LC_MESSAGES/gtk20.mo ]; then + zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo + zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo + else + zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20.mo + zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20-properties.mo + fi +elif [ -f lib/locale/de/LC_MESSAGES/gtk20.mo ]; then + zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo + zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo +else + zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20.mo + zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20-properties.mo +fi zip -r $ZIP share/doc/gtk+-@GTK_VERSION@ |