From 35bec76b6371057746ac11ac25cffab75b8641db Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 12 Nov 2018 01:15:58 -0800 Subject: Fix installation of the license file ... for ct-ng configured without --enable-local. Also, install licenses in subdirectories of the components. Also, ct-ng configured with --enable-local removed the scripts directory upon `ct-ng distclean`. Also, misspelled CT_WGET/CT_CURL variables prevented use of `ct-ng updatetools`. Fixes #1091. Signed-off-by: Alexey Neyman --- scripts/functions | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'scripts/functions') diff --git a/scripts/functions b/scripts/functions index 491c7595..7150b5ba 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2402,27 +2402,21 @@ fi CT_InstallCopyingInformation() { - local pkgname - local pkgdir local licfile local dstdir CT_DoLog EXTRA "Collect license information from: ${CT_SRC_DIR}" CT_DoLog EXTRA "Put the license information to: ${CT_PREFIX_DIR}/share/licenses" - shopt -s nullglob - - for pkgdir in ${CT_SRC_DIR}/*; do - pkgname=$(basename "${pkgdir}") - for licfile in ${pkgdir}/{COPYING*,LICENSE*}; do - dstdir="${CT_PREFIX_DIR}/share/licenses/${pkgname}" - mkdir -p "${dstdir}" - CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/" - done + for licfile in $( find "${CT_SRC_DIR}" -follow -type f -a \( -name "COPYING*" -o -name "LICENSE*" \) ); do + dstdir="${licfile%/*}" + dstdir="${CT_PREFIX_DIR}/share/licenses${dstdir#${CT_SRC_DIR}}" + mkdir -p "${dstdir}" + CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/" done # Also add crosstool's information - for licfile in ${CT_TOP_DIR}/{COPYING*,LICENSE*,licenses.d}; do + for licfile in ${CT_LIB_DIR}/{COPYING*,LICENSE*,licenses.d}; do dstdir="${CT_PREFIX_DIR}/share/licenses/crosstool-ng" mkdir -p "${dstdir}" CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/" -- cgit v1.2.3