X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fconfigmake;h=c0354e434f3a2d5fbf3dd675639ff8fee95399ea;hb=e2b32fd06585da0807fe10045e70799cc5c8252f;hp=8090a33c4fc3afe4ab0eab8d2e1344349fb844ca;hpb=0a97da1f8eb46cb449f137a46ddb2b5e0719810d;p=gnulib.git

diff --git a/modules/configmake b/modules/configmake
index 8090a33c4..c0354e434 100644
--- a/modules/configmake
+++ b/modules/configmake
@@ -23,7 +23,10 @@ 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 $@
 	( \
 	  echo '#define PREFIX "$(prefix)"'; \
 	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@@ -48,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