[SCM] live-build branch, debian-next, updated. debian/3.0_a30-1-11-gef53525

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit ef53525970f0d3d9410e8a356fc9170cbead016a
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 1 09:27:16 2011 +0200

    Automatically using an embedded live-build copy from within the config tree at local/live-build, if existing.
    
    This allows to ship (an almost) self contained config tree.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index ae8b7af..643123c 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -12,7 +12,15 @@ Set_defaults ()
 {
 	## config/common
 
-	LB_BASE="${LB_BASE:-/usr/share/live/build}"
+	if [ -e local/live-build ]
+	then
+		LB_BASE="${LB_BASE:-${PWD}/local/live-build}"
+		PATH="${PWD}/local/live-build/scripts/build:${PATH}"
+		export LB_BASE PATH
+	else
+		LB_BASE="${LB_BASE:-/usr/share/live/build}"
+		export LB_BASE
+	fi
 
 	# Setting mode (currently: debian, emdebian, progress, ubuntu and kubuntu)
 	LB_MODE="${LB_MODE:-debian}"
diff --git a/scripts/build.sh b/scripts/build.sh
index 443e9ee..74898d4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-LB_BASE="${LB_BASE:-/usr/share/live/build}"
+if [ -e local/live-build ]
+then
+	LB_BASE="${LB_BASE:-${PWD}/local/live-build}"
+	PATH="${PWD}/local/live-build/scripts/build:${PATH}"
+	export LB_BASE PATH
+else
+	LB_BASE="${LB_BASE:-/usr/share/live/build}"
+	export LB_BASE
+fi
 
 # Source global functions
 for FUNCTION in "${LB_BASE}"/functions/*.sh

-- 
live-build