X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fconfigmake;h=b814ffdff53524eed775e316baa088984c717008;hb=439db487c60a05eaf541fc9d8dd49218bcb8fd8d;hp=c3e9b37d63aa9a6738d3786fdc95355b23b7122b;hpb=d1aadab21bf8755e0fb75a838dc650e73f6ee78d;p=gnulib.git

diff --git a/modules/configmake b/modules/configmake
index c3e9b37d6..b814ffdff 100644
--- a/modules/configmake
+++ b/modules/configmake
@@ -23,9 +23,11 @@ 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 1.10a+ documentation.
 configmake.h: Makefile
 	rm -f $@-t $@
-	( \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  echo '#define PREFIX "$(prefix)"'; \
 	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
 	  echo '#define BINDIR "$(bindir)"'; \
@@ -49,8 +51,11 @@ configmake.h: Makefile
 	  echo '#define LOCALEDIR "$(localedir)"'; \
 	  echo '#define MANDIR "$(mandir)"'; \
 	  echo '#define MANEXT "$(manext)"'; \
-	:) | sed '/""/d' >$@-t
-	chmod a-x $@-t
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t
 	mv $@-t $@
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t