From da400d4fe7f8071a7f80b2e56936665552945062 Mon Sep 17 00:00:00 2001 From: Gerd Flaig Date: Fri, 2 Jan 2015 19:29:41 +0100 Subject: [PATCH] Remove superfluous override directive in make check Travis CI and OS X system make on 10.9.x at least don't have GNU make >=3.82 which contains a parser enhancement that allows multiple directives. Signed-off-by: Gerd Flaig Here's why removing override is a good idea. The variable assignment should already override anything Make may find in its environment. All "override" does is protect against unwise make arguments. "info make" says: The `override' directive was not invented for escalation in the war between makefiles and command arguments. It was invented so you can alter and add to values that the user specifies with command arguments. Thus, override is ill-advised here. Signed-off-by: Markus Armbruster --- Make.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Make.mk b/Make.mk index d6cefbe0..2cd5efc4 100644 --- a/Make.mk +++ b/Make.mk @@ -251,8 +251,8 @@ dist: dist-source dist-client dist-info .PHONY: check check-accept _check check check-accept: _check -check: export override EMPIRE_CHECK_ACCEPT := -check-accept: export override EMPIRE_CHECK_ACCEPT := y +check: export EMPIRE_CHECK_ACCEPT := +check-accept: export EMPIRE_CHECK_ACCEPT := y _check: all @echo "Warning: test suite is immature and needs work." >&2 $(srcdir)/tests/files-test $(srcdir)