diff --git a/sc2/build/build.sh b/sc2/build/build.sh
index b54f6e164..af8a67b6a 100644
--- a/sc2/build/build.sh
+++ b/sc2/build/build.sh
@@ -29,7 +29,7 @@ if [ -e build.vars -a -z "$BUILD_COMMAND" ]; then
 fi
 
 # Read in the Makeinfo file for the dir currently being processed
-. "${BUILD_REC_PATH}Makeinfo"
+. "${BUILD_REC_PATH:=}Makeinfo"
 
 # If we're recursing, go on.
 if [ -n "$BUILD_COMMAND" ]; then
diff --git a/sc2/build/config_functions b/sc2/build/config_functions
index 8414db9ec..b936afa95 100644
--- a/sc2/build/config_functions
+++ b/sc2/build/config_functions
@@ -40,9 +40,9 @@ try_compile_c() {
 	fi
 	cat > "$TEMPFILE.c"
 	echo_and_perform $COMPILE $1 $2 "$TEMPFILE.c" \
-			-o /dev/null 2>&1 >> "$BUILDLOG"
+			-o "$TEMPFILE.out" 2>&1 >> "$BUILDLOG"
 	RESULT=$?
-	rm -f "$TEMPFILE.c"
+	rm -f "$TEMPFILE.c" "$TEMPFILE.out"
 	return $RESULT
 }