From 6f84cab2a882e42b3c829836f1874fc2c856165f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 28 Jul 2008 00:36:49 +0000 Subject: [PATCH] Message catalogs should always get installed into share/locale nowadays, 2008-07-28 Tor Lillqvist * 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. svn path=/trunk/; revision=7262 --- ChangeLog | 7 +++++++ glib-zip.in | 22 +++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index fde833c..5774648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-07-28 Tor Lillqvist + * 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. + +2008-07-28 Tor Lillqvist + Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. diff --git a/glib-zip.in b/glib-zip.in index dd6c660..a971c8b 100755 --- a/glib-zip.in +++ b/glib-zip.in @@ -14,10 +14,16 @@ cp -p @abs_srcdir@/COPYING share/doc/glib-@GLIB_VERSION@ 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 -@ <