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

diff --git a/modules/configmake b/modules/configmake
index 8090a33c4..5160128e6 100644
--- a/modules/configmake
+++ b/modules/configmake
@@ -23,8 +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)"'; \
@@ -48,16 +51,21 @@ configmake.h: Makefile
 	  echo '#define LOCALEDIR "$(localedir)"'; \
 	  echo '#define MANDIR "$(mandir)"'; \
 	  echo '#define MANEXT "$(manext)"'; \
-	:) | sed '/""/d' >$@-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