diff options
| author |   jsg <jsg@openbsd.org> | 2019-11-15 00:06:46 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-11-15 00:06:46 +0000 |
| commit | dd3da1751a26290a2d850772a231739c4e9f0c77 (patch) | |
| tree | 83523999dedb83acecf6041f60f5be6e8691e024 | |
| parent | HTTP/1.1 for ftp(1) (diff) | |
| download | wireguard-openbsd-dd3da1751a26290a2d850772a231739c4e9f0c77.tar.xz wireguard-openbsd-dd3da1751a26290a2d850772a231739c4e9f0c77.zip | |
libusb was renamed to libusbhid in 2001 but the old DPADD var name was
kept. Rename LIBUSB to LIBUSBHID as there is only one LIBUSB use and
many more attempts to refer to LIBUSBHID.
| -rw-r--r-- | share/mk/bsd.README | 4 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 4 | ||||
| -rw-r--r-- | usr.bin/usbhidctl/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 27a47892a74..f27364659d4 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.README,v 1.83 2019/11/14 23:44:26 jsg Exp $ +# $OpenBSD: bsd.README,v 1.84 2019/11/15 00:06:46 jsg Exp $ # $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $ # @(#)bsd.README 5.1 (Berkeley) 5/11/90 @@ -365,7 +365,7 @@ DPADD Additional dependencies for the program. Usually used for LIBTERMCAP /usr/lib/libtermcap.a LIBTERMLIB /usr/lib/libtermlib.a LIBTLS /usr/lib/libtls.a - LIBUSB /usr/lib/libusbhid.a + LIBUSBHID /usr/lib/libusbhid.a LIBUTIL /usr/lib/libutil.a LIBY /usr/lib/liby.a LIBZ /usr/lib/libz.a diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 4d4d368852f..b27848912c8 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.80 2019/11/14 23:44:26 jsg Exp $ +# $OpenBSD: bsd.prog.mk,v 1.81 2019/11/15 00:06:46 jsg Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -59,7 +59,7 @@ LIBSSL?= ${DESTDIR}/usr/lib/libssl.a LIBTLS?= ${DESTDIR}/usr/lib/libtls.a LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a LIBTERMLIB?= ${DESTDIR}/usr/lib/libtermlib.a -LIBUSB?= ${DESTDIR}/usr/lib/libusbhid.a +LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a LIBY?= ${DESTDIR}/usr/lib/liby.a LIBZ?= ${DESTDIR}/usr/lib/libz.a diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile index 2ddba645f55..a95593bfc9c 100644 --- a/usr.bin/usbhidctl/Makefile +++ b/usr.bin/usbhidctl/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2001/12/30 07:10:42 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2019/11/15 00:06:46 jsg Exp $ # $NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $ PROG= usbhidctl SRCS= usbhid.c LDADD+= -lusbhid -DPADD+= ${LIBUSB} +DPADD+= ${LIBUSBHID} .include <bsd.prog.mk> |