diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-03 16:21:53 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-03 16:21:53 +0000 |
| commit | e6473a1f3c37ea35159cd4d7d3c4bb693c9a99f6 (patch) | |
| tree | 415bc9c3acdef0963f6b16ee78c39608ae642f0c /lib | |
| parent | d55e00843a3d660bf081aabf50fab05ccbba1eec (diff) | |
| download | FreeBSD-src-e6473a1f3c37ea35159cd4d7d3c4bb693c9a99f6.zip FreeBSD-src-e6473a1f3c37ea35159cd4d7d3c4bb693c9a99f6.tar.gz | |
MFC r273756,r287980:
r273756:
only install .pc files when we are not installing 32bit compat libs...
r287980:
Replace beforeinstall: handling with FILES.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libusb/Makefile | 11 | ||||
| -rw-r--r-- | lib/libz/Makefile | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 92c0843..15b2533 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -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 # diff --git a/lib/libz/Makefile b/lib/libz/Makefile index dce0ab3..dca7a1b 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -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> |
