From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 1 Mar 2020 21:09:37 +0000 Subject: General cleanup, pt. III. dist/dist_digest.dist: removes obsolete dist file. etc/{build.usage,README.md}: updated. groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group. groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group. groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set. groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set. groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set. groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set. midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF. subr/rtl_fileop.subr: adds ch{mod,own} fileops. vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file. --- vars/psxstub_host.vars | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'vars/psxstub_host.vars') diff --git a/vars/psxstub_host.vars b/vars/psxstub_host.vars index 7cef39d5..42282dcc 100644 --- a/vars/psxstub_host.vars +++ b/vars/psxstub_host.vars @@ -3,14 +3,16 @@ # pkg_psxstub_install_make() { - if [ "${PKG_TARGET}" = i686-nt32-midipix ] \ - || [ "${PKG_TARGET}" = x86_64-nt64-midipix ]; then - rtl_fileop cd "${PKG_BASE_DIR}/psxstub"; - make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; - if [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]; then - rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a"; + if [ "${PKG_TARGET}" = "i686-nt32-midipix" ]\ + || [ "${PKG_TARGET}" = "x86_64-nt64-midipix" ]; then + if ! rtl_fileop cd "${PKG_BASE_DIR}/psxstub"\ + || ! make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; then + return 1; + elif [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]\ + && ! rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a"; then + return 1; fi; fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 -- cgit v1.2.3