From 273b8a358f8c1674ec8bf15f06cd55c21f61ddf1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 11 Aug 2011 11:20:28 -0700
Subject: [PATCH] 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>.
---
 ChangeLog          | 8 ++++++++
 modules/configmake | 8 ++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6e27cda7..d020dd517 100644
--- 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 a387984a3..46c0fcccc 100644
--- 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
-- 
2.11.0