* modules/configmake (Makefile.am): Add support for the

Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR.

diff --git a/ChangeLog b/ChangeLog
index f1eb571943820ba604b9caddc47a16a0fbee40b8..ed51d96301afdb3dbb5d2dc4ea5a83eca72ef5a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/configmake (Makefile.am): Add support for the
+       Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR.
+
 2006-09-15  Jim Meyering  <jim@meyering.net>
 
        * modules/rename-dest-slash: New module.

diff --git a/modules/configmake b/modules/configmake
index 77903c3ed5275513cd643da54a7acced48cfb936..c0354e434f3a2d5fbf3dd675639ff8fee95399ea 100644 (file)
--- a/modules/configmake
+++ b/modules/configmake
@@ -23,6 +23,8 @@ Makefile.am:
 # Another advantage is that 'make' output is shorter.
 #
 # Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake documentation.
 configmake.h: Makefile
        rm -f $@-t $@
        ( \
@@ -49,6 +51,9 @@ configmake.h: Makefile
          echo '#define LOCALEDIR "$(localedir)"'; \
          echo '#define MANDIR "$(mandir)"'; \
          echo '#define MANEXT "$(manext)"'; \
+         echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+         echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+         echo '#define PKGDATADIR "$(pkgdatadir)"'; \
        :) | sed '/""/d' >$@-t
        mv $@-t $@
 BUILT_SOURCES += configmake.h