Commit acd7c43e authored by Jeremy Mikola's avatar Jeremy Mikola

Revert to more traditional error reporting in Makefile

This fixes an issue with 12c54575 where the error function was always being invoked.
parent 41c9bc86
...@@ -10,7 +10,8 @@ composer: ...@@ -10,7 +10,8 @@ composer:
elif test -r composer.phar; then \ elif test -r composer.phar; then \
php composer.phar $(COMPOSER_ARGS); \ php composer.phar $(COMPOSER_ARGS); \
else \ else \
$(error Cannot find composer); \ echo >&2 "Cannot find composer; aborting."; \
false; \
fi fi
test: composer test: composer
...@@ -20,7 +21,8 @@ test: composer ...@@ -20,7 +21,8 @@ test: composer
elif test -r phpunit.phar; then \ elif test -r phpunit.phar; then \
php phpunit.phar $(PHPUNIT_ARGS); \ php phpunit.phar $(PHPUNIT_ARGS); \
else \ else \
$(error Cannot find phpunit); \ echo >&2 "Cannot find phpunit; aborting."; \
false; \
fi fi
apigen: apigen:
...@@ -30,7 +32,8 @@ apigen: ...@@ -30,7 +32,8 @@ apigen:
elif test -r apigen.phar; then \ elif test -r apigen.phar; then \
php apigen.phar generate; \ php apigen.phar generate; \
else \ else \
$(error Cannot find agigen); \ echo >&2 "Cannot find apigen; aborting."; \
false; \
fi fi
mkdocs: mkdocs:
...@@ -38,7 +41,8 @@ mkdocs: ...@@ -38,7 +41,8 @@ mkdocs:
if test $$? -eq 0; then \ if test $$? -eq 0; then \
mkdocs build --clean; \ mkdocs build --clean; \
else \ else \
$(error Cannot find mkdocs); \ echo >&2 "Cannot find mkdocs; aborting."; \
false; \
fi fi
release/%: release-log/% release/%: release-log/%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment