diff options
| author | jmg <jmg@FreeBSD.org> | 2014-10-27 23:43:25 +0000 |
|---|---|---|
| committer | jmg <jmg@FreeBSD.org> | 2014-10-27 23:43:25 +0000 |
| commit | fd5207ca6139663a95661433d0225b811f25b7bb (patch) | |
| tree | a036fb4dec1307841ca32b34b7d7de9485abcbfc | |
| parent | e8117f8fe3cdaa8baa49b35f2c8dea697b35c543 (diff) | |
| download | FreeBSD-src-fd5207ca6139663a95661433d0225b811f25b7bb.zip FreeBSD-src-fd5207ca6139663a95661433d0225b811f25b7bb.tar.gz | |
only install .pc files when we are not installing 32bit compat libs...
This fixes the problem of installing the .pc files multiple times...
| -rw-r--r-- | lib/libusb/Makefile | 2 | ||||
| -rw-r--r-- | lib/libz/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 92c0843..1ef85d4 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -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 diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 1b2fec5..1f9bb72 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -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> |
