glib r7262 - trunk

[tml svn gnome org]

Author: tml
Date: Mon Jul 28 00:36:49 2008
New Revision: 7262
URL: http://svn.gnome.org/viewvc/glib?rev=7262&view=rev

Log:
2008-07-28  Tor Lillqvist  <tml novell com>

	* glib-zip.in: Message catalogs should always get installed into
	share/locale nowadays, don't bother with the convoluted logic
	checking if they are in lib/locale instead. Put the correct helper
	programs in the zipfile.



Modified:
   trunk/ChangeLog
   trunk/glib-zip.in

Modified: trunk/glib-zip.in
==============================================================================
--- trunk/glib-zip.in	(original)
+++ trunk/glib-zip.in	Mon Jul 28 00:36:49 2008
@@ -14,10 +14,16 @@
 mkdir -p share/doc/glib-dev- GLIB_VERSION@
 cp -p @abs_srcdir@/COPYING share/doc/glib-dev- GLIB_VERSION@
 
+if test @LIB_EXE_MACHINE_FLAG@ = X64; then
+  helperbits=64
+else
+  helperbits=32
+fi
+
 rm $ZIP
 zip $ZIP -@ <<EOF
-bin/gspawn-win32-helper.exe
-bin/gspawn-win32-helper-console.exe
+bin/gspawn-win${helperbits}-helper.exe
+bin/gspawn-win${helperbits}-helper-console.exe
 bin/libglib-2 0- LT_CURRENT_MINUS_AGE@.dll
 bin/libgio-2 0- LT_CURRENT_MINUS_AGE@.dll
 bin/libgmodule-2 0- LT_CURRENT_MINUS_AGE@.dll
@@ -25,17 +31,7 @@
 bin/libgthread-2 0- LT_CURRENT_MINUS_AGE@.dll
 EOF
 
-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/locale/*/LC_MESSAGES/glib20.mo
 
 zip -r $ZIP share/doc/glib- GLIB_VERSION@