Tweak value of INTLLIBS.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 480eb309534af1b7d2ad69451c5d34bf1d6844fa..615f7d8ac002828574397b37536b564d8086614b 100644 (file)
--- 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 8b0ad3c8aa6955f45d8ca58d005e562332bcf82a..5cc7a274f245105ea3bf81cf53192b8cb58955ba 100644 (file)
--- 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