[SCM] live-build branch, tmp-syslinux, updated. debian/3.0_a5-1-19-g26a59d6

[Daniel Baumann]

The following commit has been merged in the tmp-syslinux branch:
commit 26a59d6b4a81e9e1a91420015b245b6b31c6c04f
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Nov 1 22:37:27 2010 +0100

    Updating.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 547b480..3fc51be 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -67,7 +67,7 @@ esac
 case "${LB_BINARY_IMAGES}" in
 	iso*)
 		_BOOTLOADER="isolinux"
-		_SUFFIX="binary"
+		_SUFFIX="binary/isolinux"
 		;;
 
 	net*)
@@ -77,12 +77,20 @@ case "${LB_BINARY_IMAGES}" in
 
 	usb*)
 		_BOOTLOADER="syslinux"
-		_SUFFIX="binary"
+		_SUFFIX="binary/syslinux"
 		;;
 esac
 
+# Copying files
 mkdir -p ${_SUFFIX}
-cp -aL ${_PREFIX}/usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER} ${_SUFFIX}
+cp -aL ${_PREFIX}/usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}/ ${_SUFFIX}
+
+# Configuring files
+if [ -e ${_SUFFIX}/live.cfg ]
+then
+	sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|" \
+	${_SUFFIX}/live.cfg
+fi
 
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)

-- 
live-build