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

From: Daniel Baumann <[email-masked]>
Date: Thu, 5 Mar 2009 16:33:31 +0100

---
 helpers/lh_binary_win32-loader | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index 9bf4370..eb7247c 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-loader/* 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" ]
-- 
cgit v1.0