diff --git a/build/genif.sh b/build/genif.sh
index 697bef95912e4..f6d6fff953476 100755
--- a/build/genif.sh
+++ b/build/genif.sh
@@ -32,7 +32,7 @@ header_list=
 olddir=$(pwd)
 
 # Go to project root.
-cd $(CDPATH= cd -- "$(dirname -- "$0")/../" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../" && pwd -P)" || exit
 
 module_ptrs="$(echo $extensions | $AWK -f ./build/order_by_dep.awk)"
 
diff --git a/buildconf b/buildconf
index af0937db1dc28..8c16c9b82747d 100755
--- a/buildconf
+++ b/buildconf
@@ -8,9 +8,9 @@ force=0
 debug=0
 
 # Go to project root.
-cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)" || exit
 
-php_extra_version=$(grep '^AC_INIT(' configure.ac)
+php_extra_version=$(grep '^AC_INIT(' configure.ac) || exit
 case "$php_extra_version" in
   *-dev*)
     dev=1
diff --git a/scripts/dev/credits b/scripts/dev/credits
index e59cc109b88d7..783bc5f18f79d 100755
--- a/scripts/dev/credits
+++ b/scripts/dev/credits
@@ -3,7 +3,7 @@
 # Generate credits_*.h headers from the ext/*/CREDITS and sapi/*/CREDITS files.
 
 # Go to project root directory
-cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
 
 awkprog='
 BEGIN { FS = "\n|\r\n|\r"; RS = "" }
diff --git a/scripts/dev/genfiles b/scripts/dev/genfiles
index 3e085c3e5397f..32b4c8851e2d1 100755
--- a/scripts/dev/genfiles
+++ b/scripts/dev/genfiles
@@ -41,7 +41,7 @@ SED=${SED:-sed}
 MAKE=${MAKE:-make}
 
 # Go to project root.
-cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
 
 # Check required bison version from the configure.ac file.
 required_bison_version=$($SED -n 's/PHP_PROG_BISON(\[\([0-9\.]*\)\].*/\1/p' configure.ac)
diff --git a/scripts/dev/makedist b/scripts/dev/makedist
index ffdf536907651..c9ad6059004be 100755
--- a/scripts/dev/makedist
+++ b/scripts/dev/makedist
@@ -15,7 +15,7 @@ if [[ $($tar --version) == *"bsdtar"* ]]; then
 fi
 
 # Go to project root directory.
-cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
 
 # Process options and arguments.
 while :; do