Date: Fri, 18 Sep 2015 23:49:33 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287980 - in head: gnu/usr.bin/groff/src/utils/indxbib lib/liblzma lib/libusb lib/libz Message-ID: <201509182349.t8INnXoT050918@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 18 23:49:32 2015 New Revision: 287980 URL: https://svnweb.freebsd.org/changeset/base/287980 Log: Replace beforeinstall: handling with FILES. This actually fixes some cases to respect LIBRARIES_ONLY. Sponsored by: EMC / Isilon Storage Division Modified: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile head/lib/liblzma/Makefile head/lib/libusb/Makefile head/lib/libz/Makefile Modified: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile ============================================================================== --- head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -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> Modified: head/lib/liblzma/Makefile ============================================================================== --- head/lib/liblzma/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/liblzma/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -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> Modified: head/lib/libusb/Makefile ============================================================================== --- head/lib/libusb/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/libusb/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -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 # Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/libz/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509182349.t8INnXoT050918>