From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 15 Sep 2006 18:54:47 +0000 (+0000)
Subject: * modules/configmake (Makefile.am): Add support for the
X-Git-Tag: cvs-readonly~1884
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=02fbd376bad12770ad1ab043ae2c41ce8168cafc;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index f1eb57194..ed51d9630 100644
--- 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 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