[SCM] debian-live branch, master, updated. 1.0_a47-1-23-g5d70e02

[Chris Lamb]

The following commit has been merged in the master branch:
commit 08009805345b1e8c411578c84ac7e43d00f67357
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Jun 14 18:27:38 2008 +0100

    Revert always deferencing symlinks when installing some binary includes.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index fc5ff5f..ba628ef 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 -L ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
+		cp -r ${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 -L ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
+		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
 	fi
 
 	# Adjusting install templates

-- 
debian-live