From 3979d453a39fd94a73adecd9cd97108d784d4d7c Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 3 Oct 2015 16:21:53 +0000
Subject: [PATCH] MFC r273756,r287980:

  r273756:
    only install .pc files when we are not installing 32bit compat libs...
  r287980:
    Replace beforeinstall: handling with FILES.


git-svn-id: svn://svn.freebsd.org/base/stable/10@288610 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 gnu/usr.bin/groff/src/utils/indxbib/Makefile |  6 ++----
 lib/libusb/Makefile                          | 11 +++--------
 lib/libz/Makefile                            |  7 ++++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b2c59a2ce..048fed0ed 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/libusb/Makefile b/lib/libusb/Makefile
index 92c084313..15b253311 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -36,16 +36,11 @@ SRCS+=		libusb10_io.c
 
 .if defined(COMPAT_32BIT)
 CFLAGS+=	-DCOMPAT_32BIT
+.else
+FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
+FILESDIR=	${LIBDATADIR}/pkgconfig
 .endif
 
-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
-
 #
 # Cross platform support
 #
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index dce0ab361..dca7a1bd6 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -68,9 +68,10 @@ test: example minigzip
 	(export LD_LIBRARY_PATH=. ; \
 		echo hello world | ./minigzip | ./minigzip -d )
 
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.CURDIR}/zlib.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+.ifndef COMPAT_32BIT
+FILES=		zlib.pc
+FILESDIR=	${LIBDATADIR}/pkgconfig
+.endif
 
 .include <bsd.lib.mk>
 
-- 
2.45.0