luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix 343825

Browse Source
This commit is contained in:
Matthias Clasen 2006-11-15 19:17:16 +00:00
parent 5df73fe1fb
commit ea372366de
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-15 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Apply a patch from James
Henstridge for compatibility with automake 2.60 (#343825)
2006-11-14 Behdad Esfahbod <behdad@gnome.org> 2006-11-14 Behdad Esfahbod <behdad@gnome.org>
* sanity_check: Replace bash-specific == with sh-understood =. * sanity_check: Replace bash-specific == with sh-understood =.

3
m4macros/glib-gettext.m4
View File

@ -376,8 +376,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix" glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix" glib_save_exec_prefix="$exec_prefix"
glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix
datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"` localedir=`eval echo "${libdir}/locale"`
else else
@ -385,6 +387,7 @@ else
fi fi
prefix="$glib_save_prefix" prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix" exec_prefix="$glib_save_exec_prefix"
datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir", AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed]) [Define the location where the catalogs will be installed])
]) ])