From: Bruno Haible <bruno@clisp.org>
Date: Fri, 26 Oct 2001 09:37:18 +0000 (+0000)
Subject: Tweak value of INTLLIBS.
X-Git-Tag: v0.11~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57650188f856420a53bcd2e63f5236f138a98806;p=thirdparty%2Fgettext.git

Tweak value of INTLLIBS.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 480eb3095..615f7d8ac 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext.m4 (AM_GNU_GETTEXT): In INTLLIBS, use ${top_builddir}
+	instead of $(top_builddir), so that the value can also be used in
+	shell scripts. Note that in Makefiles both ${top_builddir} and
+	$(top_builddir) are equivalent.
+
 2001-10-09  Bruno Haible  <haible@clisp.cons.org>
 
 	* gettext.m4 (AM_GNU_GETTEXT): Add check for getc_unlocked.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 8b0ad3c8a..5cc7a274f 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -164,7 +164,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
         INTLOBJS="\$(GETTOBJS)"
 	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
-	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+	INTLLIBS="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi