Mercurial > gnulib

changeset 11736:9f4d092a26a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jim Meyering <meyering@redhat.com>
date Sat, 25 Jul 2009 15:43:11 +0200
parents 1dc493668d2b
children 351c1d4b1ca6
files ChangeLog top/maint.mk
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jul 25 11:17:24 2009 +0200
+++ b/ChangeLog	Sat Jul 25 15:43:11 2009 +0200
@@ -1,3 +1,13 @@
+2009-07-25  Jim Meyering  <meyering@redhat.com>
+
+	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  <bruno@clisp.org>
 
 	* lib/math.in.h (cosl, logl, sinl): Don't declare if they are already
--- a/top/maint.mk	Sat Jul 25 11:17:24 2009 +0200
+++ b/top/maint.mk	Sat Jul 25 15:43:11 2009 +0200
@@ -44,7 +44,7 @@
   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 @@
 ## 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 = \