Date: Mon, 27 Oct 2014 23:43:25 +0000 (UTC) From: John-Mark Gurney <jmg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273756 - in head/lib: libusb libz Message-ID: <201410272343.s9RNhPW8064075@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmg Date: Mon Oct 27 23:43:25 2014 New Revision: 273756 URL: https://svnweb.freebsd.org/changeset/base/273756 Log: only install .pc files when we are not installing 32bit compat libs... This fixes the problem of installing the .pc files multiple times... Modified: head/lib/libusb/Makefile head/lib/libz/Makefile Modified: head/lib/libusb/Makefile ============================================================================== --- head/lib/libusb/Makefile Mon Oct 27 23:31:07 2014 (r273755) +++ head/lib/libusb/Makefile Mon Oct 27 23:43:25 2014 (r273756) @@ -38,6 +38,7 @@ SRCS+= libusb10_io.c CFLAGS+= -DCOMPAT_32BIT .endif +.ifndef COMPAT_32BIT beforeinstall: ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig @@ -45,6 +46,7 @@ beforeinstall: ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig +.endif # # Cross platform support Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Mon Oct 27 23:31:07 2014 (r273755) +++ head/lib/libz/Makefile Mon Oct 27 23:43:25 2014 (r273756) @@ -68,9 +68,11 @@ test: example minigzip (export LD_LIBRARY_PATH=. ; \ echo hello world | ./minigzip | ./minigzip -d ) +.ifndef COMPAT_32BIT beforeinstall: ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/zlib.pc ${DESTDIR}${LIBDATADIR}/pkgconfig +.endif .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410272343.s9RNhPW8064075>