libtool 1.5 installs DLLs in the bin subdirectory, so get them from there.

2003-06-11  Tor Lillqvist  <tml@iki.fi>

	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
	subdirectory, so get them from there.

	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
	same way as the po files for Serbian in Latin and Cyrillic script.
This commit is contained in:
Tor Lillqvist 2003-06-11 22:06:16 +00:00 committed by Tor Lillqvist
parent 34d2573657
commit 94fed3f988
8 changed files with 56 additions and 15 deletions

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -1,3 +1,11 @@
2003-06-11 Tor Lillqvist <tml@iki.fi>
* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
subdirectory, so get them from there.
* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
same way as the po files for Serbian in Latin and Cyrillic script.
2003-06-11 Sebastian Wilhelmi <seppi@seppi.de> 2003-06-11 Sebastian Wilhelmi <seppi@seppi.de>
* configure.in: Remove false &. Spotted by Albert Chin * configure.in: Remove false &. Spotted by Albert Chin

View File

@ -9,13 +9,13 @@ DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
cd @prefix@ cd @prefix@
rm $ZIP rm $ZIP
zip -r $ZIP -@ <<EOF zip $ZIP -@ <<EOF
COPYING.LIB-2 COPYING.LIB-2
bin/gspawn-win32-helper.exe bin/gspawn-win32-helper.exe
lib/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
lib/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
EOF EOF
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo

View File

@ -199,19 +199,12 @@ g_win32_getlocale (void)
#endif #endif
} }
break; break;
case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN */
* What used to be called Serbo-Croatian
* should really now be two separate
* languages because of political reasons.
* (Says tml, who knows nothing about Serbian
* or Croatian.)
* (I can feel those flames coming already.)
*/
switch (sub) switch (sub)
{ {
/* FIXME: How to distinguish Croatian and Latin Serbian locales? */ /* FIXME: How to distinguish Croatian and Latin Serbian locales? */
case SUBLANG_SERBIAN_LATIN: l = "sr"; break; case SUBLANG_SERBIAN_LATIN: l = "sr"; sl = "@Latn"; break;
case SUBLANG_SERBIAN_CYRILLIC: l = "sr"; sl = "@cyrillic"; break; case SUBLANG_SERBIAN_CYRILLIC: l = "sr"; break;
default: l = "hr"; sl = "HR"; default: l = "hr"; sl = "HR";
} }
break; break;