git: 41b278bd7181 - stable/13 - Convert libs with pc files to use PCFILES

[Emmanuel Vadot]

The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=41b278bd71817ba237a643fcd396dd3021873012

commit 41b278bd71817ba237a643fcd396dd3021873012
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-03-16 06:13:07 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-06-30 07:24:30 +0000

    Convert libs with pc files to use PCFILES
    
    Now the .pc ends up in the correct package (-dev)
    
    Reviewed by:    bapt, emaste
    Differential Revision:  https://reviews.freebsd.org/D29172
    MFC after:      2 weeks
---
 lib/liblzma/Makefile  | 3 +--
 lib/libmagic/Makefile | 3 +--
 lib/libusb/Makefile   | 3 +--
 lib/libz/Makefile     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 63424bd3dcc2..4f38ef391e4a 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -154,8 +154,7 @@ CFLAGS+=	-DSYMBOL_VERSIONING
 
 CLEANFILES+=	liblzma.pc
 
-FILES=		liblzma.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	liblzma.pc
 
 liblzma.pc: liblzma.pc.in
 	sed -e 's, at prefix@,/usr,g ; \
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index e390ff1261c6..5f967102fe02 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -86,7 +86,6 @@ ${inc}: ${inc}.in
 	sed -e 's,X.YY,${FILEVER:S,",,g:S,.,,g},g' ${.ALLSRC} > ${.TARGET}
 .endfor
 
-FILES+=			libmagic.pc
-FILESDIR_libmagic.pc=	${LIBDATADIR}/pkgconfig
+PCFILES=	libmagic.pc
 
 .include <bsd.lib.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index cf263b732c35..83c9f1ade075 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -38,8 +38,7 @@ SRCS+=		libusb10_io.c
 CFLAGS+=	-DCOMPAT_32BIT
 .endif
 
-FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
 
 #
 # Cross platform support
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 48e57ccc2a1a..4ece3e3e059f 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -75,7 +75,6 @@ test: example minigzip
 	(export LD_LIBRARY_PATH=. ; \
 		echo hello world | ./minigzip | ./minigzip -d )
 
-FILES=		zlib.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	zlib.pc
 
 .include <bsd.lib.mk>