Substitute a few more variables.

diff --git a/ChangeLog b/ChangeLog
index 46829318fd1d18aec1a6a11a5f52c9147004fdfa..e51e8db5410adf543259d8b113780fac7c908cd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,8 @@
        (gl_INTTYPES_MODULE_INDICATOR, gl_INTTYPES_H_DEFAULTS): New macros.
        * modules/inttypes (Depends-on): Add link-warning.
        (Makefile.am): Copy the contents of build-aux/link-warning.h into
-       inttypes.h.
+       inttypes.h. Substitute also GNULIB_IMAXABS, GNULIB_IMAXDIV,
+       GNULIB_STRTOIMAX, GNULIB_STRTOUMAX.
        * modules/imaxabs (configure.ac): Invoke gl_INTTYPES_MODULE_INDICATOR.
        * modules/imaxdiv (configure.ac): Likewise.
        * modules/strtoimax (configure.ac): Likewise.

diff --git a/modules/inttypes b/modules/inttypes
index 804deb9358e98894603784699332e2d79485b2f7..2352a3c28694ebbe522a82fa1e833b9f445af55c 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -28,6 +28,10 @@ inttypes.h: inttypes_.h
              -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
              -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
              -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
+             -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
+             -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
+             -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
+             -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
              -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
              -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
              -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \