diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-05-30 22:49:13 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-30 22:49:13 +0000 |
commit | f558a8cc1183b1f878b83dad4bf49ab9065290ab (patch) | |
tree | 1e4ca534f6e99db628a35a48a94ed455bd2def7a | |
parent | 8f7b2b5cc15e1c6792e6bac7fa74bd4a4d771e33 (diff) | |
download | glib-f558a8cc1183b1f878b83dad4bf49ab9065290ab.tar.gz glib-f558a8cc1183b1f878b83dad4bf49ab9065290ab.tar.bz2 glib-f558a8cc1183b1f878b83dad4bf49ab9065290ab.zip |
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)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-12 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | m4macros/glib-gettext.m4 | 3 |
7 files changed, 39 insertions, 0 deletions
@@ -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 8275f62ef..4450fb290 100644 --- 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 8275f62ef..4450fb290 100644 --- 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 8275f62ef..4450fb290 100644 --- 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 8275f62ef..4450fb290 100644 --- 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 8275f62ef..4450fb290 100644 --- 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 09b2ff5b3..add13da0a 100644 --- 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]) ]) |