Re: [PATCH] Silence error if globals.h doesn't exist

[Giuseppe Scrivano]

Andreas Schwab <address@hidden> writes:

> Giuseppe Scrivano <address@hidden> writes:
>
>> diff --git a/src/Makefile.in b/src/Makefile.in
>> index 2ac34f5..cd661fb 100644
>> --- a/src/Makefile.in
>> +++ b/src/Makefile.in
>> @@ -498,7 +498,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) 
>> $(GLOBAL_SOURCES)
>>      $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
>>  
>>  globals.h: gl-stamp
>> -    $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
>> +    $(AM_V_GEN)cmp $< $@ >/dev/null 2>&1 || cp $< $@
>
> That should use move-if-change.

thanks for the review, is OK something like the following?

>From 52192756b0969a6f646c5b67206b5192edd153f7 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Fri, 30 Jan 2015 17:09:37 +0100
Subject: [PATCH] Silence error if globals.h doesn't exist

---
 src/ChangeLog   | 4 ++++
 src/Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 2130312..735ebb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-30  Giuseppe Scrivano  <address@hidden>
+
+       * Makefile.in (globals.h): Redirect 'cmp' stderr to /dev/null.
+
 2015-01-30  Eli Zaretskii  <address@hidden>
 
        * dired.c (read_dirent): Accept an additional argument
diff --git a/src/Makefile.in b/src/Makefile.in
index 2ac34f5..45cc2f4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -498,7 +498,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
        $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
 
 globals.h: gl-stamp
-       $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
+       $(AM_V_GEN)${top_srcdir}/build-aux/move-if-change $< $@
 
 $(ALLOBJS): globals.h
 
-- 
2.1.0