From 89ca4e2de037df4b898feb7db98f5b8c837aa913 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Mon, 27 Oct 2014 23:43:25 +0000 Subject: [PATCH] only install .pc files when we are not installing 32bit compat libs... This fixes the problem of installing the .pc files multiple times... --- lib/libusb/Makefile | 2 ++ lib/libz/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 92c0843139bf..1ef85d4b6f50 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 1b2fec59911a..1f9bb72bc527 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