summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_win32-loader
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-03-05 16:33:31 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:43 +0100
commit336a46f22616845d6f4aeffc2d09e57bb7612552 (patch)
treed41324eb27f2bf5368db5820365e372ba5e2ad5c /helpers/lh_binary_win32-loader
parentf2a30e7d0ee6d4204a8e55a3f03a67c78ddec9ac (diff)
downloadlive-build-336a46f22616845d6f4aeffc2d09e57bb7612552.zip
live-build-336a46f22616845d6f4aeffc2d09e57bb7612552.tar.gz
Correcting win32-loader copy call to work with non-chrooted builds too.
Diffstat (limited to 'helpers/lh_binary_win32-loader')
-rwxr-xr-xhelpers/lh_binary_win32-loader22
1 files 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" ]