From: Bruno Haible Date: Sun, 24 Aug 2003 14:06:29 +0000 (+0000) Subject: Fix. X-Git-Tag: v0.13~320 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49fb6ef9a4ef59163cd914f0f10e7e935b8dacf;p=thirdparty%2Fgettext.git Fix. --- diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index 66ef90136..cf9b21623 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,9 @@ +2003-08-24 Bruno Haible + + * relocatable.m4 (AC_RELOCATABLE): Use $(host) instead of @host@, + since the substitution of @host@ may occur before the substitution of + @SET_RELOCATABLE@. + 2002-12-24 Bruno Haible * mbswidth.m4 (gl_MBSWIDTH): Renamed from jm_PREREQ_MBSWIDTH. Use diff --git a/gettext-tools/m4/relocatable.m4 b/gettext-tools/m4/relocatable.m4 index febd0f5e4..8fb285e5a 100644 --- a/gettext-tools/m4/relocatable.m4 +++ b/gettext-tools/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 1 (gettext-0.12) +# relocatable.m4 serial 2 (gettext-0.12.2) dnl Copyright (C) 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -31,7 +31,7 @@ AC_DEFUN([AC_RELOCATABLE], /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;; *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;; esac - SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"@host@\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" + SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" else dnl Unfortunately we cannot define INSTALL_PROGRAM to a command dnl consisting of more than one word - libtool doesn't support this.