git: de99fa005af6 - main - Mk/bsd.port.mk: add ${LOCALBASE}/share/pkgconfig support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 Jul 2022 08:20:37 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=de99fa005af6a2f9e47976b7272fb987be2d6fbf
commit de99fa005af6a2f9e47976b7272fb987be2d6fbf
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-07-29 08:16:23 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-07-29 08:17:31 +0000
Mk/bsd.port.mk: add ${LOCALBASE}/share/pkgconfig support
In d48fab59daa56e0b3b6ffecef57a69c32ae9c0a7 ${LOCALBASE}/share/pkgconfig
was added as a valid location for pc files. Chase this change when using
base-pkgconfig files.
---
Mk/bsd.port.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index d0bafd9a7242..0ded60991a2f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1681,8 +1681,8 @@ CONFIGURE_ENV+= PATH=${PATH}
PKGCONFIG_LINKDIR= ${WRKDIR}/.pkgconfig
PKGCONFIG_BASEDIR= /usr/libdata/pkgconfig
. if !${MAKE_ENV:MPKG_CONFIG_LIBDIR=*} && !${CONFIGURE_ENV:MPKG_CONFIG_LIBDIR=*}
-MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR}
-CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR}
+MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${LOCALBASE}/share/pkgconfig:${PKGCONFIG_BASEDIR}
+CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${LOCALBASE}/share/pkgconfig:${PKGCONFIG_BASEDIR}
. endif
. if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)