summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-06-14 05:25:36 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:34 +0100
commita1caf63a92eb6ed359ba46e0e5ad2180880e5599 (patch)
tree8f3e185adfc4e7970c40cb81c4044a029737e8b1
parent41638d792185d1c0f43d661523f8e30464b270f8 (diff)
downloadlive-build-a1caf63a92eb6ed359ba46e0e5ad2180880e5599.zip
live-build-a1caf63a92eb6ed359ba46e0e5ad2180880e5599.tar.gz
Always deference symlinks when installing some binary includes to fix breakage on amd64.
-rwxr-xr-xhelpers/lh_binary_includes4
1 files changed, 2 insertions, 2 deletions
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