[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-25-g1af6c99

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 1af6c999228ad6e9a8c884eda4d6e21f7962d9cb
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 5 16:33:31 2009 +0100

    Correcting win32-loader copy call to work with non-chrooted builds too.

diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index 9bf4370..dfa39a9 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -46,17 +46,23 @@ if [ "${LH_DISTRIBUTION}" != "etch" ]
 then
 	case "${LH_ARCHITECTURE}" in
 		amd64|i386)
-			# Checking depends
-			Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
+			if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+			then
+				# Checking depends
+				Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
+
+				# Restoring cache
+				Restore_cache cache/packages_binary
 
-			# Restoring cache
-			Restore_cache cache/packages_binary
+				# Installing depends
+				Install_package
 
-			# Installing depends
-			Install_package
+				# Copying win32-loader
+				cp chroot/usr/lib/win32-loader/* binary
+			else
+				cp /usr/lib/win32-loadler/* binary
+			fi
 
-			# Copying win32-loader
-			cp chroot/usr/lib/win32-loader/* binary
 			mv binary/win32-loader.exe binary/setup.exe
 
 			if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]

-- 
Debian Live build scripts