expand $exec_prefix as well as $prefix. (#107290, reported by Morten

Fri May 30 18:46:05 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: expand $exec_prefix as
        well as $prefix. (#107290, reported by Morten Welinder,
        patch from Raja Harinath)
This commit is contained in:
Owen Taylor 2003-05-30 22:49:13 +00:00 committed by Owen Taylor
parent 8f7b2b5cc1
commit f558a8cc11
7 changed files with 39 additions and 0 deletions

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -1,3 +1,9 @@
Fri May 30 18:46:05 2003 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-gettext.m4: expand $exec_prefix as
well as $prefix. (#107290, reported by Morten Welinder,
patch from Raja Harinath)
Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com> Fri May 30 17:24:23 2003 Owen Taylor <otaylor@redhat.com>
* glib-gettextize.in: Quote $srcdir to handle $srcdir * glib-gettextize.in: Quote $srcdir to handle $srcdir

View File

@ -311,13 +311,16 @@ glib_DEFUN(GLIB_GNU_GETTEXT,
glib_DEFUN(GLIB_DEFINE_LOCALEDIR, 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"
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
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
localedir=`eval echo "${datadir}/locale"` localedir=`eval echo "${datadir}/locale"`
fi fi
prefix="$glib_save_prefix" prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
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])
]) ])