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)

diff --git a/ChangeLog b/ChangeLog
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8275f62..4450fb2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * glib-gettextize.in: Quote $srcdir to handle $srcdir

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 09b2ff5..add13da 100644 (file)
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -311,13 +311,16 @@ glib_DEFUN(GLIB_GNU_GETTEXT,
 glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
 [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
 glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 if test "x$CATOBJEXT" = "x.mo" ; then
   localedir=`eval echo "${libdir}/locale"`
 else
   localedir=`eval echo "${datadir}/locale"`
 fi
 prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
 AC_DEFINE_UNQUOTED($1, "$localedir",
   [Define the location where the catalogs will be installed])
 ])