2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 05c4a5e9b..72764eec0 100755
--- a/configure
+++ b/configure
@@ -1077,7 +1077,7 @@ EOF
 
 			print "Writing \e[1;32m$file\e[0m ...\n";
 
-			$config{BUILD_DIR} ||= 'build';
+			$config{BUILD_DIR} ||= resolve_directory($config{ME}."/build");
 
 			for my $var (qw(
 				CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR
diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index d4786b8fe..23a7dfb76 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -4,6 +4,8 @@ use warnings;
 BEGIN { push @INC, $ENV{SOURCEPATH}; }
 use make::configure;
 
+chdir $ENV{BUILDPATH};
+
 my $out = shift;
 my $verbose;