From 5c21029483104c283edc1d3096eadfbb127c970f Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Jan 13 2020 14:31:38 +0000 Subject: vars/build.vars:openbsd_baseutils:${PKG_BUILD_STEPS_DISABLE}: don't disable install_make. vars/openbsd_baseutils.vars:pkg_openbsd_baseutils_install{,_make}(): override correct build step. --- diff --git a/vars/build.vars b/vars/build.vars index 650ec26..edd5566 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1684,7 +1684,6 @@ fi; : ${PKG_OPENBSD_BASEUTILS_URLS_GIT:="baseutils=https://github.com/ibara/baseutils.git@master"}; : ${PKG_OPENBSD_BASEUTILS_BUILD_DIR:=baseutils}; : ${PKG_OPENBSD_BASEUTILS_ENV_VARS_EXTRA:="MANDIR=${PREFIX_NATIVE}/share/man"}; -: ${PKG_OPENBSD_BASEUTILS_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_OPENSMTPD_SHA256SUM:=eb1bedbfb23d9f08f509d92d8efcaf51d56fb2f44492f40ec059d41124a2f1d9}; : ${PKG_OPENSMTPD_VERSION:=6.6.1p1}; : ${PKG_OPENSMTPD_URL:=https://www.opensmtpd.org/archives/opensmtpd-${PKG_OPENSMTPD_VERSION}.tar.gz} diff --git a/vars/openbsd_baseutils.vars b/vars/openbsd_baseutils.vars index e709f6e..f77a0c6 100644 --- a/vars/openbsd_baseutils.vars +++ b/vars/openbsd_baseutils.vars @@ -7,7 +7,7 @@ pkg_openbsd_baseutils_build() { make -C ${PKG_BUILD_DIR}/pax CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}" }; -pkg_openbsd_baseutils_install() { +pkg_openbsd_baseutils_install_make() { make -C ${PKG_BUILD_DIR}/pax install PREFIX="${PKG_DESTDIR}" MANDIR="${PKG_DESTDIR}/share/man" }