diff --git a/vars/build.vars b/vars/build.vars index 2a92c97..ba3a914 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1093,7 +1093,7 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist"; # Build target dist_target # DIST_TARGET_NO_LOG_VARS=1; -DIST_TARGET_PACKAGES="dist_minipix dist_etc dist_digest dist_tarballs"; +DIST_TARGET_PACKAGES="dist_minipix_dist dist_etc dist_digest dist_tarballs"; # # Build targets diff --git a/vars/dist_minipix.vars b/vars/dist_minipix.vars deleted file mode 100644 index 9761dc0..0000000 --- a/vars/dist_minipix.vars +++ /dev/null @@ -1,22 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -pkg_dist_minipix_all() { - local _dist_pfx="${PREFIX_MINIPIX}" _bin_pname _lib_name; - ex_rtl_fileop rm "${_dist_pfx}"; - ex_rtl_fileop mkdir "${_dist_pfx}"; - ex_rtl_fileop mkdir "${_dist_pfx}/bin"; - 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}/bin"; - done; - for _lib_name in libc.so libncursesw.so.6 libpsxscl.so libu16ports.so.0; do - ex_rtl_fileop cp_follow \ - "${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin"; - done; - tar -C "${PREFIX_NATIVE}/share" -cpf - terminfo |\ - tar -C "${_dist_pfx}/bin" -xpf -; -}; - -# vim:filetype=sh diff --git a/vars/dist_minipix_dist.vars b/vars/dist_minipix_dist.vars new file mode 100644 index 0000000..8584c69 --- /dev/null +++ b/vars/dist_minipix_dist.vars @@ -0,0 +1,22 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_dist_minipix_dist_all() { + local _dist_pfx="${PREFIX_MINIPIX}" _bin_pname _lib_name; + ex_rtl_fileop rm "${_dist_pfx}"; + ex_rtl_fileop mkdir "${_dist_pfx}"; + ex_rtl_fileop mkdir "${_dist_pfx}/bin"; + 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}/bin"; + done; + for _lib_name in libc.so libncursesw.so.6 libpsxscl.so libu16ports.so.0; do + ex_rtl_fileop cp_follow \ + "${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin"; + done; + tar -C "${PREFIX_NATIVE}/share" -cpf - terminfo |\ + tar -C "${_dist_pfx}/bin" -xpf -; +}; + +# vim:filetype=sh