From d5afb4ad3d60f078e64e402e403f0e55fc711714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 6 Feb 2017 02:49:26 +0100 Subject: build.sh, {subr,vars}/*: general cleanup. --- subr/pkg_patch.subr | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'subr/pkg_patch.subr') diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index 8cb173f9..3730395c 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -6,19 +6,19 @@ pkg_patch() { local _patch_fname; if [ -d "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}" ]; then set +o noglob; - for _patch_fname in "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch"; do - patch -b -d "../${PKG_SUBDIR}" -p1 < "${_patch_fname}"; + for _patch_fname in ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch; do + patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; done; set -o noglob; fi; - for _patch_fname in \ - "${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local.patch" \ - "${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local@${BUILD_HNAME}.patch" \ - "${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch" \ - "${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch" \ - "${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch"; do + for _patch_fname in \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ + ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do if [ -r "${_patch_fname}" ]; then - patch -b -d "../${PKG_SUBDIR}" -p1 < "${_patch_fname}"; + patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; fi; done; }; -- cgit v1.2.3