Replace beforeinstall: handling with FILES.

This actually fixes some cases to respect LIBRARIES_ONLY.

Sponsored by:	EMC / Isilon Storage Division

diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b2c59a2cee81444764b08d752076447e485d9ee6..048fed0ed4a05ffa519c7e51f1dd1e6148ebcb86 100644 (file)
--- 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 39b929fd1f800a2097cc91fa759cf8775c632fd0..8a6c23d84d1d03439ba25780f97e88a217de75e0 100644 (file)
--- 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 6560f8f0b231dfa21f038b34413016c7cd90b187..25d886a5c454af29e45bea7a255b4ca247534949 100644 (file)
--- 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 1f9bb72bc52722f41b3794ad602f86cc9293376c..aed4ee3828c6508ce689fa05ca25c8690641915e 100644 (file)
--- 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>