X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fconfigmake;h=d826c13af05528464fc68e3c4eeb1db0cd019a0f;hb=8099cad631717c6f59d3b1e149971e243eee796e;hp=a19d29bf0c24fa8b8e5c1d067d340910a4e1505f;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/configmake b/modules/configmake
index a19d29bf0..d826c13af 100644
--- a/modules/configmake
+++ b/modules/configmake
@@ -24,9 +24,9 @@ Makefile.am:
 #
 # Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
-# listed in the Automake documentation.
+# listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
-	rm -f $@-t $@
+	$(AM_V_GEN)rm -f $@-t && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  echo '#define PREFIX "$(prefix)"'; \
 	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@@ -51,19 +51,26 @@ configmake.h: Makefile
 	  echo '#define LOCALEDIR "$(localedir)"'; \
 	  echo '#define MANDIR "$(mandir)"'; \
 	  echo '#define MANEXT "$(manext)"'; \
-	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
-	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
 	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
-	} | sed '/""/d' > $@-t
-	mv $@-t $@
+	  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:
+/* Include only after all system include files.  */
 "configmake.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all