From c5e7ca3926c05fbfc8612799493f0b5ffaebcd7b Mon Sep 17 00:00:00 2001 From: Owsjannikow Sergej E Date: Fri, 30 Oct 2020 14:37:03 +0100 Subject: [PATCH] FreeBSD: Use variables instead of fixed paths in global rules. Signed-off-by: Owsjannikow Sergej E. --- freebsd/trinity.port.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/freebsd/trinity.port.mk b/freebsd/trinity.port.mk index 0de956dfc..7536bd336 100644 --- a/freebsd/trinity.port.mk +++ b/freebsd/trinity.port.mk @@ -31,7 +31,7 @@ TDE_DEBUG?= 0 .MAKEFLAGS= # Reset makeflags to avoid -B supplied from bsd.port.subdir.mk -PKG_CONFIG_PATH=/opt/trinity/libdata/pkgconfig:/usr/local/libdata/pkgconfig:/usr/libdata/pkgconfig +PKG_CONFIG_PATH=${TDE_PREFIX}/libdata/pkgconfig:/usr/local/libdata/pkgconfig:/usr/libdata/pkgconfig EXTRACT_DEPENDS=\ gtar:${PORTSDIR}/archivers/gtar \ @@ -161,8 +161,8 @@ tde-cmake-install: tde-install ### Custom build targets for AUTOTOOLS tde-autotools-prepare: [ -z "${TDE_BUILD_SUBDIR}" ] || rm -rf "${WRKSRC}/${TDE_BUILD_SUBDIR}" - cp -f "/usr/local/share/aclocal/libtool.m4" "${WRKSRC}/admin/libtool.m4.in" - cp -f "/usr/local/share/libtool/build-aux/ltmain.sh" "${WRKSRC}/admin/ltmain.sh" + cp -f "${LOCALBASE}/share/aclocal/libtool.m4" "${WRKSRC}/admin/libtool.m4.in" + cp -f "${LOCALBASE}/share/libtool/build-aux/ltmain.sh" "${WRKSRC}/admin/ltmain.sh" gsed -i "${WRKSRC}/admin/acinclude.m4.in" -e "s|/usr/include/tqt|${LOCALBASE}/include/tqt|g" ${MAKE_CMD} -C "${WRKSRC}" -f "admin/Makefile.common"