summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfunctions/common.sh2
-rwxr-xr-xfunctions/defaults.sh2
-rwxr-xr-xscripts/build/lb_config6
3 files changed, 8 insertions, 2 deletions
diff --git a/functions/common.sh b/functions/common.sh
index d11dec1..1c221d1 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -12,4 +12,4 @@ PACKAGE="live-build"
VERSION="2.0~a28-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
-PATH="${PWD}/auto/helpers:${PATH}"
+PATH="${PWD}/auto/scripts:${PATH}"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index b9b475f..193d59b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -226,7 +226,7 @@ Set_defaults ()
LB_TEMPLATES="${LB_BASE}/templates"
fi
- # Setting live helper options
+ # Setting live build options
_BREAKPOINTS="${_BREAKPOINTS:-false}"
_COLOR="${_COLOR:-false}"
_DEBUG="${_DEBUG:-false}"
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index afb6935..487d81c 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1288,6 +1288,7 @@ LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
EOF
mkdir -p auto/functions
+mkdir -p auto/scripts
if [ "${CONFIG}" = "clone" ] # FIXME
then
@@ -1354,6 +1355,11 @@ then
rmdir --ignore-fail-on-non-empty auto/functions
fi
+ if [ -d auto/scripts]
+ then
+ rmdir --ignore-fail-on-non-empty auto/scripts
+ fi
+
if [ -d auto ]
then
rmdir --ignore-fail-on-non-empty auto