From 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 19 Jul 2012 19:37:26 +0200
Subject: Fixing up inclusion of functions while allowing local usage of
 live-build with different file layouts.

---
 scripts/build/lb_binary_syslinux | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'scripts/build/lb_binary_syslinux')

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 2788103dd..d6719f0dc 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -11,7 +11,7 @@
 set -e
 
 # Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs syslinux into binary')"
@@ -158,7 +158,12 @@ then
 		_SOURCE="config/bootloaders/${_BOOTLOADER}"
 	else
 		# Internal system copy
-		_SOURCE="${LB_BASE:-/usr/share/live/build}/bootloaders/${_BOOTLOADER}"
+		if [ -n "${LIVE_BUILD}" ]
+		then
+			_SOURCE="${LIVE_BUILD}/bootloaders/${_BOOTLOADER}"
+		else
+			_SOURCE="/usr/share/live/build/bootloaders/${_BOOTLOADER}"
+		fi
 	fi
 else
 	# External copy from chroot or system
-- 
cgit v1.2.3