-BP_RUN([(cd $DIST_DIR/_$BINID && tar cfz pspp-$DIST_VERSION-$BINID.tar.gz pspp-$DIST_VERSION-$BINID) >&AS_MESSAGE_LOG_FD 2>&1])
-BP_MOVE_OUTPUT([binary distribution], [$DIST_DIR/_$BINID/pspp-$DIST_VERSION-$BINID.tar.gz])
-
-BP_START_STEP([Check])
-BP_TRY_RUN([(cd $DIST_DIR/_$BINID && make check) >&AS_MESSAGE_LOG_FD 2>&1])
-_bp_status=$?
-for base in tests/testsuite.log tests/testsuite.dir; do
- fn=$DIST_DIR/_$BINID/$base
- if test -e "$fn"; then
- BP_MOVE_OUTPUT([test logs], [$fn])
+BP_RUN([(cd $builddir && tar cfz pspp-$DIST_VERSION-$BINID.tar.gz pspp-$DIST_VERSION-$BINID) >&AS_MESSAGE_LOG_FD 2>&1])
+BP_MOVE_OUTPUT([binary distribution], [$builddir/pspp-$DIST_VERSION-$BINID.tar.gz])
+
+if $check; then
+ BP_START_STEP([Check])
+ BP_TRY_RUN([(cd $builddir && make check) >&AS_MESSAGE_LOG_FD 2>&1])
+ _bp_status=$?
+ for base in tests/testsuite.log tests/testsuite.dir; do
+ fn=$builddir/$base
+ if test -e "$fn"; then
+ BP_MOVE_OUTPUT([test logs], [$fn])
+ fi
+ done
+ if test $_bp_status != 0; then
+ AS_ECHO(["$as_me:$LINENO: command exited with status $_bp_status"]) >&AS_MESSAGE_LOG_FD
+ exit 1