1 files changed, 8 insertions, 9 deletions
diff --git a/helpers/lh_build b/helpers/lh_build
index e2cef4c11..3e8e7829b 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -9,30 +9,29 @@
 
 set -e
 
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
 do
-	. ${FUNCTION}
+	. "${FUNCTION}"
 done
 
-# Set static variables
+# Setting static variables
 DESCRIPTION="build a Debian Live system"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
 Arguments "${@}"
 
-Echo_debug "Init ${PROGRAM}"
-Breakpoint "build: Init"
-
 # Bootstrapping system
 lh_bootstrap ${*}
 
 # Customizing chroot
 lh_chroot ${*}
 
-# Building binary image
+# Building binary images
 lh_binary ${*}
 
-# Building source image
+# Building source images
 lh_source ${*}