annotate automake snippets with $(AM_V_GEN) and $(AM_V_at)

[pspp] / modules / configmake

diff --git a/modules/configmake b/modules/configmake
index 9cc2a98e62471823b3a5b677e7055b9cdf7e008a..881a40bf8d5c18ec0ed952f0e1c22c8131268796 100644 (file)
--- 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.
-configmake.h:
-       ( \
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+       $(AM_V_GEN)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,26 @@ configmake.h:
          echo '#define LOCALEDIR "$(localedir)"'; \
          echo '#define MANDIR "$(mandir)"'; \
          echo '#define MANEXT "$(manext)"'; \
-       :) | sed '/""/d' >$@-t
-       mv $@-t $@
+         echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+         echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+         echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+         echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+       } | sed '/""/d' > $@-t && \
+       if test -f $@ && cmp $@-t $@ > /dev/null; then \
+         rm -f $@-t; \
+       else \
+         rm -f $@; mv $@-t $@; \
+       fi
+
 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