summaryrefslogtreecommitdiff
path: root/scripts/build/companion_libs
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-12-02 22:50:58 (GMT)
committerAlexey Neyman <stilor@att.net>2016-12-02 23:02:58 (GMT)
commit51a3606b17b62eb5a9ae5616467f8814792969b7 (patch)
tree21a80ffd8ec99c981c3949a6da73b0d192bd0412 /scripts/build/companion_libs
parentf7f70b67c44727d9eea48997c837e87c5e63ca33 (diff)
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 <path> .' gives an error and 'cp -a <path> <newdir>' creates <newdir> as a symlink (which will then run the build inside the shared directory, .build/src/<package>). Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/companion_libs')
-rw-r--r--scripts/build/companion_libs/320-libiconv.sh2
-rw-r--r--scripts/build/companion_libs/330-gettext.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
index 2f1b209..ffe60c2 100644
--- a/scripts/build/companion_libs/320-libiconv.sh
+++ b/scripts/build/companion_libs/320-libiconv.sh
@@ -88,7 +88,7 @@ do_libiconv_backend() {
CT_DoLog EXTRA "Configuring libiconv"
- CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}" "."
+ CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/." "."
if [ "${static_build}" = "y" ]; then
extra_config+=("--disable-shared")
diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
index 6be51bf..19d3ca8 100644
--- a/scripts/build/companion_libs/330-gettext.sh
+++ b/scripts/build/companion_libs/330-gettext.sh
@@ -88,7 +88,7 @@ do_gettext_backend() {
CT_DoLog EXTRA "Configuring gettext"
- CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/"/* .
+ CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/." .
# A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions
# but gettext configure doesn't see this flag when it checks for that. An