[SCM] debian-live branch, master, updated. 1.0_a47-1-12-g88c9e3f

[Chris Lamb]

The following commit has been merged in the master branch:
commit 88c9e3f922d43f3a57c1258654c57825395eb8e6
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Jun 14 05:25:36 2008 +0100

    Always deference symlinks when installing some binary includes to fix breakage on amd64.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index ba628ef..fc5ff5f 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -118,13 +118,13 @@ then
 	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
 	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* > /dev/null 2>&1
 	then
-		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
+		cp -r -L ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
 	fi
 
 	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
 	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* > /dev/null 2>&1
 	then
-		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
+		cp -r -L ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
 	fi
 
 	# Adjusting install templates

-- 
debian-live