From 51a3606b17b62eb5a9ae5616467f8814792969b7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 2 Dec 2016 14:50:58 -0800 Subject: Fix use of custom location if it is a directory. In that case, CT_GetCustom just creates a symlink to the original. In that case, 'cp -a .' gives an error and 'cp -a ' creates as a symlink (which will then run the build inside the shared directory, .build/src/). Signed-off-by: Alexey Neyman --- scripts/build/debug/200-duma.sh | 2 +- scripts/build/debug/400-ltrace.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/debug') diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index a84366c9..0e5291c1 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -24,7 +24,7 @@ do_debug_duma_extract() { do_debug_duma_build() { CT_DoStep INFO "Installing D.U.M.A." CT_DoLog EXTRA "Copying sources" - cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma" + cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma" CT_Pushd "${CT_BUILD_DIR}/build-duma" DUMA_CPP= diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 56f25800..fdf1e40d 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -22,7 +22,7 @@ do_debug_ltrace_build() { CT_DoStep INFO "Installing ltrace" CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}" \ + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \ "${CT_BUILD_DIR}/build-ltrace" CT_Pushd "${CT_BUILD_DIR}/build-ltrace" -- cgit v1.2.3