diff --git a/src/script_opt/CPP/bare-embedded-build b/src/script_opt/CPP/bare-embedded-build
index ade7b3d9db..5001e9923a 100755
--- a/src/script_opt/CPP/bare-embedded-build
+++ b/src/script_opt/CPP/bare-embedded-build
@@ -1,13 +1,12 @@
 #! /bin/sh
 
-base=../../..
-so=$base/src/script_opt/CPP
-build=$base/build
+build=../../../build
 
-echo > $so/CPP-gen-addl.h
-export -n ZEEK_USE_CPP ZEEK_ADD_CPP
-export ZEEK_HASH_DIR=$build
-cd $build
-echo | src/zeek -b -O gen-C++
-mv ./CPP-gen-addl.h $so/CPP-gen.cc
-ninja || echo Bare embedded build failed
+echo > CPP-gen-addl.h
+(cd $build
+ export -n ZEEK_USE_CPP ZEEK_ADD_CPP
+ export ZEEK_HASH_DIR=.
+ echo | src/zeek -b -O gen-C++
+)
+mv $build/CPP-gen-addl.h CPP-gen.cc
+(cd $build ; ninja || echo Bare embedded build failed)
diff --git a/src/script_opt/CPP/full-embedded-build b/src/script_opt/CPP/full-embedded-build
index 492791c675..b542086bcc 100755
--- a/src/script_opt/CPP/full-embedded-build
+++ b/src/script_opt/CPP/full-embedded-build
@@ -1,13 +1,12 @@
 #! /bin/sh
 
-base=../../..
-so=$base/src/script_opt/CPP
-build=$base/build
+build=../../../build
 
-echo > $so/CPP-gen-addl.h
-export -n ZEEK_USE_CPP ZEEK_ADD_CPP
-export ZEEK_HASH_DIR=$build
-cd $build
-echo | src/zeek -O gen-C++
-mv ./CPP-gen-addl.h $so/CPP-gen.cc
-ninja || echo Full embedded build failed
+echo > CPP-gen-addl.h
+(cd $build
+ export -n ZEEK_USE_CPP ZEEK_ADD_CPP
+ export ZEEK_HASH_DIR=.
+ echo | src/zeek -O gen-C++
+)
+mv $build/CPP-gen-addl.h CPP-gen.cc
+(cd $build ; ninja || echo Full embedded build failed)