Skip to content

Commit acd7c43

Browse files
committed
Revert to more traditional error reporting in Makefile
This fixes an issue with 12c5457 where the error function was always being invoked.
1 parent 41c9bc8 commit acd7c43

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ composer:
1010
elif test -r composer.phar; then \
1111
php composer.phar $(COMPOSER_ARGS); \
1212
else \
13-
$(error Cannot find composer); \
13+
echo >&2 "Cannot find composer; aborting."; \
14+
false; \
1415
fi
1516

1617
test: composer
@@ -20,7 +21,8 @@ test: composer
2021
elif test -r phpunit.phar; then \
2122
php phpunit.phar $(PHPUNIT_ARGS); \
2223
else \
23-
$(error Cannot find phpunit); \
24+
echo >&2 "Cannot find phpunit; aborting."; \
25+
false; \
2426
fi
2527

2628
apigen:
@@ -30,15 +32,17 @@ apigen:
3032
elif test -r apigen.phar; then \
3133
php apigen.phar generate; \
3234
else \
33-
$(error Cannot find agigen); \
35+
echo >&2 "Cannot find apigen; aborting."; \
36+
false; \
3437
fi
3538

3639
mkdocs:
3740
@command -v mkdocs >/dev/null 2>&1; \
3841
if test $$? -eq 0; then \
3942
mkdocs build --clean; \
4043
else \
41-
$(error Cannot find mkdocs); \
44+
echo >&2 "Cannot find mkdocs; aborting."; \
45+
false; \
4246
fi
4347

4448
release/%: release-log/%

0 commit comments

Comments
 (0)