[SCM] live-helper branch, debian-next, updated. debian/2.0_a13-1-9-g72bc386
Daniel Baumann
daniel at debian.org
Sat May 29 12:29:21 UTC 2010
The following commit has been merged in the debian-next branch:
commit 72bc386e07d005ba22df1d9ebd609463d947bf9f
Author: Daniel Baumann <daniel at debian.org>
Date: Sat May 29 14:22:48 2010 +0200
Making win32-loader directory autodected, this is less pain than doing it based on the distribution we're building.
diff --git a/helpers/binary_win32-loader b/helpers/binary_win32-loader
index 759ebac..043e448 100755
--- a/helpers/binary_win32-loader
+++ b/helpers/binary_win32-loader
@@ -44,15 +44,13 @@ Create_lockfile .lock
case "${LH_ARCHITECTURE}" in
amd64|i386)
- case "${LH_DISTRIBUTION}" in
- lenny)
- WIN32_LOADER="/usr/lib/win32-loader"
- ;;
-
- *)
- WIN32_LOADER="/usr/share/win32"
- ;;
- esac
+ if [ -e /usr/lib/win32-loader ]
+ then
+ WIN32_LOADER="/usr/lib/win32-loader"
+ elif [ -e /usr/share/win32 ]
+ then
+ WIN32_LOADER="/usr/share/win32"
+ fi
if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
then
--
live-helper
More information about the debian-live-changes
mailing list