Fix inefficiency introduced on 2007-11-03.

[gnulib.git] / modules / configmake

diff --git a/modules/configmake b/modules/configmake
index 77903c3..a1169a9 100644 (file)
--- 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,7 +51,11 @@ 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
@@ -58,7 +64,7 @@ Include:
 "configmake.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all