empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove superfluous override directive in make check

Browse source 
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 <gefla@pond.sub.org>

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 <armbru@pond.sub.org>
This commit is contained in:
Gerd Flaig 2015-01-02 19:29:41 +01:00 • committed by Markus Armbruster
parent 990b246b86
commit da400d4fe7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Make.mk
View file

@ -251,8 +251,8 @@ dist: dist-source dist-client dist-info
.PHONY: check check-accept _check .PHONY: check check-accept _check
check check-accept: _check check check-accept: _check
check: export override EMPIRE_CHECK_ACCEPT := check: export EMPIRE_CHECK_ACCEPT :=
check-accept: export override EMPIRE_CHECK_ACCEPT := y check-accept: export EMPIRE_CHECK_ACCEPT := y
_check: all _check: all
@echo "Warning: test suite is immature and needs work." >&2 @echo "Warning: test suite is immature and needs work." >&2
$(srcdir)/tests/files-test $(srcdir) $(srcdir)/tests/files-test $(srcdir)