Date: Sat, 3 Oct 2015 16:21:54 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288610 - in stable/10: gnu/usr.bin/groff/src/utils/indxbib lib/libusb lib/libz Message-ID: <201510031621.t93GLsT6089577@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Oct 3 16:21:53 2015 New Revision: 288610 URL: https://svnweb.freebsd.org/changeset/base/288610 Log: MFC r273756,r287980: r273756: only install .pc files when we are not installing 32bit compat libs... r287980: Replace beforeinstall: handling with FILES. Modified: stable/10/gnu/usr.bin/groff/src/utils/indxbib/Makefile stable/10/lib/libusb/Makefile stable/10/lib/libz/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/gnu/usr.bin/groff/src/utils/indxbib/Makefile ============================================================================== --- stable/10/gnu/usr.bin/groff/src/utils/indxbib/Makefile Sat Oct 3 16:21:06 2015 (r288609) +++ stable/10/gnu/usr.bin/groff/src/utils/indxbib/Makefile Sat Oct 3 16:21:53 2015 (r288610) @@ -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: stable/10/lib/libusb/Makefile ============================================================================== --- stable/10/lib/libusb/Makefile Sat Oct 3 16:21:06 2015 (r288609) +++ stable/10/lib/libusb/Makefile Sat Oct 3 16:21:53 2015 (r288610) @@ -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 # Modified: stable/10/lib/libz/Makefile ============================================================================== --- stable/10/lib/libz/Makefile Sat Oct 3 16:21:06 2015 (r288609) +++ stable/10/lib/libz/Makefile Sat Oct 3 16:21:53 2015 (r288610) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510031621.t93GLsT6089577>