Add support for PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR to configmake

[Paul Eggert]

For Bison, I installed the following to add support for
Automake-supplied variables to configmake.

The javaversion module can now be simplified a bit, by adding a
dependency on configmake, so that its 'make' output is made a bit
shorter.

2006-09-15  Paul Eggert  <address@hidden>

        * modules/configmake (Makefile.am): Add support for the
        Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR.

--- modules/configmake  8 Sep 2006 12:26:35 -0000       1.6
+++ modules/configmake  15 Sep 2006 18:54:26 -0000
@@ -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 address@hidden $@
        ( \
@@ -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' >address@hidden
        mv address@hidden $@
 BUILT_SOURCES += configmake.h