Re: maint.mk: suppress missing-file diagnostics [Re: errors on QNX 6.4.1

[Jim Meyering]

Jim Meyering wrote:
...
> Good ideas both.
> I've been annoyed at least by the .prev-version one
> so propose this change to avoid the diagnostics:

I've corrected the spelling of Simon's last name (thanks for
spotting those, Ralf!) and pushed this change:

>From ef70f5d61674108ba5d0fc1efe02d136d3111ee1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 25 Jul 2009 15:43:11 +0200
Subject: [PATCH] maint.mk: avoid warnings about missing files

* top/maint.mk (PREV_VERSION): Suppress stderr, to hide a
diagnostic when .prev-version does not exist.
(_cfg_mk): Define, so it can be empty when cfg.mk does not exist.
(syntax-check-rules): Use $(_cfg_mk) to avoid a diagnostic about
nonexistent cfg.mk.
Suggestions from Simon Josefsson.
---
 ChangeLog    |   10 ++++++++++
 top/maint.mk |    6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bab6c18..5369ce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-07-25  Jim Meyering  <address@hidden>
+
+       maint.mk: avoid warnings about missing files
+       * top/maint.mk (PREV_VERSION): Suppress stderr, to hide a
+       diagnostic when .prev-version does not exist.
+       (_cfg_mk): Define, so it can be empty when cfg.mk does not exist.
+       (syntax-check-rules): Use $(_cfg_mk) to avoid a diagnostic about
+       nonexistent cfg.mk.
+       Suggestions from Simon Josefsson.
+
 2009-07-25  Bruno Haible  <address@hidden>

        * lib/math.in.h (cosl, logl, sinl): Don't declare if they are already
diff --git a/top/maint.mk b/top/maint.mk
index c49fea3..228b414 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -44,7 +44,7 @@ ifeq ($(origin prev_version_file), undefined)
   prev_version_file = $(srcdir)/.prev-version
 endif

-PREV_VERSION := $(shell cat $(prev_version_file))
+PREV_VERSION := $(shell cat $(prev_version_file) 2>/dev/null)
 VERSION_REGEXP = $(subst .,\.,$(VERSION))
 PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))

@@ -70,9 +70,11 @@ export LC_ALL = C
 ## Sanity checks.  ##
 ## --------------- ##

+_cfg_mk := $(shell test -f $(srcdir)/cfg.mk && echo '$(srcdir)/cfg.mk')
+
 # Collect the names of rules starting with `sc_'.
 syntax-check-rules := $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
-                       $(srcdir)/$(ME) $(srcdir)/cfg.mk)
+                       $(srcdir)/$(ME) $(_cfg_mk))
 .PHONY: $(syntax-check-rules)

 local-checks-available = \
--
1.6.4.rc2.216.g769fa