X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fconfigmake;h=5160128e6ea105ebf0099afbb069052b49eb530e;hb=883b9007b919bce1c06e030c28220aeee2a825fc;hp=2ffe57b2ba1c77db91351be2a94e5b368c56b096;hpb=f110f8c4810ee8acf04df527cba30413f709648f;p=gnulib.git

diff --git a/modules/configmake b/modules/configmake
index 2ffe57b2b..5160128e6 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,17 +51,21 @@ configmake.h: Makefile
 	  echo '#define LOCALEDIR "$(localedir)"'; \
 	  echo '#define MANDIR "$(mandir)"'; \
 	  echo '#define MANEXT "$(manext)"'; \
-	:) | sed '/""/d' >$@-t
-	chmod a-w $@-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
 
 Include:
-"configmake.h"
+/* Include only after all system include files.  */
+#include "configmake.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all