all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Giuseppe Scrivano <gscrivano@gnu.org>
To: emacs-devel@gnu.org
Subject: [PATCH] Silence error if globals.h doesn't exist
Date: Fri, 30 Jan 2015 17:14:44 +0100	[thread overview]
Message-ID: <87wq44nt3f.fsf@redhat.com> (raw)

a trivial fix, introduced by commit "d703a4dce564ede122f5c307889e4bd0e3f3e75c"

Just "run make clean && make" to see the error while building.

Regards,
Giuseppe

From 04619422fd84beb5abf63f3a990aaba38937b889 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivano@gnu.org>
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  <gscrivano@gnu.org>
+
+	* Makefile.in (globals.h): Redirect 'cmp' stderr to /dev/null.
+
 2015-01-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* dired.c (read_dirent): Accept an additional argument
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 $< $@
 
 $(ALLOBJS): globals.h
 
-- 
2.1.0




             reply	other threads:[~2015-01-30 16:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-30 16:14 Giuseppe Scrivano [this message]
2015-01-30 16:35 ` [PATCH] Silence error if globals.h doesn't exist Andreas Schwab
2015-01-30 18:45   ` Giuseppe Scrivano
2015-01-31  3:32   ` Paul Eggert
2015-01-31  8:16     ` Andreas Schwab
2015-01-31 12:41       ` Giuseppe Scrivano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wq44nt3f.fsf@redhat.com \
    --to=gscrivano@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.