configmake: fix make -q problem

* modules/configmake (configmake.h): Update configmake.h's time stamp
even if the file does not change.  Otherwise, 'make -q' fails.
Problem reported by Simon Josefsson in
<http://lists.gnu.org/archive/html/bug-gnulib/2011-08/msg00088.html>.

diff --git a/ChangeLog b/ChangeLog
index f6e27cda78b9bcd2f1d4dec7c772d18dc44f1ac9..d020dd5171d1c103f52489dc4e9d8277a72b45fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       configmake: fix make -q problem
+       * modules/configmake (configmake.h): Update configmake.h's time stamp
+       even if the file does not change.  Otherwise, 'make -q' fails.
+       Problem reported by Simon Josefsson in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2011-08/msg00088.html>.
+
 2011-08-11  Jim Meyering  <meyering@redhat.com>
 
        git-version-gen: correct the advice in a comment

diff --git a/modules/configmake b/modules/configmake
index a387984a37d7138b4c9d418393436469d8ce02fd..46c0fccccc0542c60023bc2dff58810085998240 100644 (file)
--- a/modules/configmake
+++ b/modules/configmake
@@ -44,12 +44,8 @@ configmake.h: Makefile
          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
+       } | sed '/""/d' > $@-t
+       mv -f $@-t $@
 
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t