From bbd35a31fc4945b6e3d5689e68c6a232ae029cbe Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Dec 22 2017 10:34:31 +0000 Subject: vars/dist_minipix_dist.vars: copy libz.so.1. vars/dist_minipix_dist.vars: restore ${PREFIX_MINIPIX}/{bin,share}/ subdirs. --- diff --git a/vars/dist_minipix_dist.vars b/vars/dist_minipix_dist.vars index b71d239..1a18b88 100644 --- a/vars/dist_minipix_dist.vars +++ b/vars/dist_minipix_dist.vars @@ -6,21 +6,21 @@ pkg_dist_minipix_dist_all() { local _dist_pfx="${PREFIX_MINIPIX}" _bin_pname _lib_name _term \ _term_letter; ex_rtl_fileop rm "${_dist_pfx}"; - ex_rtl_fileop mkdir "${_dist_pfx}"; - for _bin_pname in $(find "${PREFIX}/minipix_dist/bin" \ + ex_rtl_fileop mkdir "${_dist_pfx}" "${_dist_pfx}/bin" "${_dist_pfx}/share"; + for _bin_pname in $(find "${PREFIX}/minipix_dist/bin" \ -maxdepth 1 -perm /a=x -type f -and \( -not -name "lib*" \)); do - ex_rtl_fileop cp_follow "${_bin_pname}" "${_dist_pfx}"; + ex_rtl_fileop cp_follow "${_bin_pname}" "${_dist_pfx}/bin"; done; - for _lib_name in libc.so libmagic.so.1 libncursesw.so.6 libpsxscl.so libu16ports.so.0; do - ex_rtl_fileop cp_follow \ - "${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}"; + for _lib_name in libc.so libmagic.so.1 libncursesw.so.6 libpsxscl.so libu16ports.so.0 libz.so.1; do + ex_rtl_fileop cp_follow \ + "${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin"; done; for _term in putty putty-256color screen screen-256color xterm xterm-256color; do _term_letter="${_term%${_term#[a-zA-Z]}}"; - ex_rtl_fileop mkdir "${_dist_pfx}/terminfo/${_term_letter}"; + ex_rtl_fileop mkdir "${_dist_pfx}/share/terminfo/${_term_letter}"; ex_rtl_fileop cp_follow \ "${PREFIX_NATIVE}/share/terminfo/${_term_letter}/${_term}" \ - "${_dist_pfx}/terminfo/${_term_letter}"; + "${_dist_pfx}/share/terminfo/${_term_letter}"; done; };