From de0e3997d9f8f1d857da7e9c179548dbf294ebcf Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 18 Sep 2015 23:49:32 +0000
Subject: [PATCH] Replace beforeinstall: handling with FILES.

This actually fixes some cases to respect LIBRARIES_ONLY.

Sponsored by:	EMC / Isilon Storage Division
---
 gnu/usr.bin/groff/src/utils/indxbib/Makefile |  6 ++----
 lib/liblzma/Makefile                         | 12 ++++--------
 lib/libusb/Makefile                          | 13 +++----------
 lib/libz/Makefile                            |  5 ++---
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b2c59a2cee81..048fed0ed4a0 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -5,9 +5,7 @@ SRCS=		indxbib.cpp signal.c
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
-
-beforeinstall:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/
+FILES=		${DIST_DIR}/eign
+FILESDIR=	${SHAREDIR}/dict/
 
 .include <bsd.prog.mk>
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 39b929fd1f80..8a6c23d84d1d 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -154,10 +154,11 @@ CFLAGS+=	-DSYMBOL_VERSIONING
 
 CLEANFILES+=	liblzma.pc
 
-.if !defined(LIBRARIES_ONLY)
-all: liblzma.pc
+FILES=		liblzma.pc
+FILESDIR=	${LIBDATADIR}/pkgconfig
+
 liblzma.pc: liblzma.pc.in
-	@sed -e 's,@prefix@,/usr,g ; \
+	sed -e 's,@prefix@,/usr,g ; \
 		s,@exec_prefix@,/usr,g  ; \
 		s,@libdir@,/usr/lib,g ; \
 		s,@includedir@,/usr/include,g ; \
@@ -166,9 +167,4 @@ liblzma.pc: liblzma.pc.in
 		s,@PTHREAD_CFLAGS@,,g ; \
 		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
 
-beforeinstall:
-	@${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-.endif
-
 .include <bsd.lib.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 6560f8f0b231..25d886a5c454 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -35,16 +35,9 @@ SRCS+=		libusb10_io.c
 
 .if defined(COMPAT_32BIT)
 CFLAGS+=	-DCOMPAT_32BIT
-.endif
-
-.ifndef COMPAT_32BIT
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+.else
+FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
+FILESDIR=	${LIBDATADIR}/pkgconfig
 .endif
 
 #
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 1f9bb72bc527..aed4ee3828c6 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -69,9 +69,8 @@ test: example minigzip
 		echo hello world | ./minigzip | ./minigzip -d )
 
 .ifndef COMPAT_32BIT
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/zlib.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+FILES=		zlib.pc
+FILESDIR=	${LIBDATADIR}/pkgconfig
 .endif
 
 .include <bsd.lib.mk>