diff --git a/scripts/deliver.sh b/scripts/deliver.sh
index f9f1b171..8a952179 100755
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -16,8 +16,12 @@ function error_exit() {
   exit $2
 }
 
+if [ ! -d "${PROJECT_DIST_DIR}" ]; then
+  error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
+fi
+
 if [ "${DIST_DIR}" == "" ]; then
-  DIST_DIR="${CURRENT_DIR}/../dist"
+  DIST_DIR="${PROJECT_DIST_DIR}"
 fi
 DIST_DIR=$(realpath "${DIST_DIR}")
 
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index 78bee19c..4a75a44d 100755
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -28,7 +28,7 @@ if [ ! -d "${PROJECT_DIST_DIR}" ]; then
 fi
 
 if [ "${DEST_DIR}" == "" ]; then
-  DEST_DIR="${CURRENT_DIR}/../dist"
+  DEST_DIR="${PROJECT_DIST_DIR}"
 fi
 DEST_DIR=$(realpath "${DEST_DIR}")