changeset 7309:901d31516630

* modules/configmake (Makefile.am): Add support for the Automake-supplied PKGLIBDIR, PKGINCLUDEDIR, PKGDATADIR.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 15 Sep 2006 18:54:47 +0000
parents eac21c5dbf2f
children 3204a760c31f
files ChangeLog modules/configmake
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/modules/configmake
+++ b/modules/configmake
@@ -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