Add gail bits. Simplify check for message catalog location.

[~andy/gtk] / gtk-zip.sh.in

diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 3d3a112da14125d1a508f3e17f161c6c54eeab4b..140563994f4c48128c67dbceacc43ff2026269ab 100755 (executable)
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -20,31 +20,24 @@ etc/gtk-2.0/gtk.immodules
 bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgailutil-@GAIL_LT_CURRENT_MINUS_AGE@.dll
 bin/gdk-pixbuf-query-loaders.exe
 bin/gtk-query-immodules-2.0.exe
 EOF
 
-zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/engines/*.dll
+zip $ZIP lib/gtk-2.0/modules/libgail.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/engines/*.dll
 
 zip $ZIP share/themes/Raleigh/gtk-2.0/gtkrc
 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
 
-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
+if [ -f share/locale/de/LC_MESSAGES/gtk20.mo ]; then
   zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20.mo
   zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20-properties.mo
+else
+  zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
+  zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo
 fi
 
 zip -r $ZIP share/doc/gtk+-@GTK_VERSION@
@@ -52,6 +45,7 @@ zip -r $ZIP share/doc/gtk+-@GTK_VERSION@
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/gtk-2.0
+include/gail-1.0
 bin/gdk-pixbuf-csource.exe
 bin/gtk-builder-convert
 bin/gtk-demo.exe
@@ -62,6 +56,8 @@ lib/libgdk-win32-@GTK_API_VERSION@.dll.a
 lib/gdk-win32-@GTK_API_VERSION@.lib
 lib/libgtk-win32-@GTK_API_VERSION@.dll.a
 lib/gtk-win32-@GTK_API_VERSION@.lib
+lib/libgailutil.dll.a
+lib/gailutil.lib
 lib/gtk-2.0/include
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-2.0.pc