From 02fbd376bad12770ad1ab043ae2c41ce8168cafc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Sep 2006 18:54:47 +0000 Subject: [PATCH] * modules/configmake (Makefile.am): Add support for the Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR. --- ChangeLog | 5 +++++ modules/configmake | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index f1eb57194..ed51d9630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/modules/configmake b/modules/configmake index 77903c3ed..c0354e434 100644 --- 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 -- 2.11.0