# HG changeset patch # User Paul Eggert # Date 1158346487 0 # Node ID 901d3151663023b4c381657e07badc5d788ccb6e # Parent eac21c5dbf2f840ce73fee8ddb512991aca30e08 * modules/configmake (Makefile.am): Add support for the Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR. diff -r eac21c5dbf2f -r 901d31516630 ChangeLog --- a/ChangeLog Fri Sep 15 18:48:09 2006 +0000 +++ b/ChangeLog Fri Sep 15 18:54:47 2006 +0000 @@ -1,3 +1,8 @@ +2006-09-15 Paul Eggert + + * modules/configmake (Makefile.am): Add support for the + Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR. + 2006-09-15 Jim Meyering * modules/rename-dest-slash: New module. diff -r eac21c5dbf2f -r 901d31516630 modules/configmake --- a/modules/configmake Fri Sep 15 18:48:09 2006 +0000 +++ b/modules/configmake Fri Sep 15 18:54:47 2006 +0000 @@ -23,6 +23,8 @@ # 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 @@ 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