diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2019-01-15 01:54:01 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2019-01-15 01:54:01 +0000 |
| commit | 0a1dbaab65cf546b7cb85fbb6980b9392da263d9 (patch) | |
| tree | f7f2c5ef45296e7d6b2cc99b3a24e8b111d2403b | |
| parent | dd180592a9149c30f45d9d1c4c863877a1864215 (diff) | |
Fix the inter-library dependency for libedit and libreadline.
Previously they tried to depend on libtermcap which actually doesn't
exist in the objdir.
ok jca
| -rw-r--r-- | gnu/lib/libreadline/Makefile | 6 | ||||
| -rw-r--r-- | lib/libedit/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile index d9604069c5b..70f1fd9a648 100644 --- a/gnu/lib/libreadline/Makefile +++ b/gnu/lib/libreadline/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2018/11/14 20:43:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2019/01/15 01:54:00 yasuoka Exp $ LIB= readline SRCS= readline.c funmap.c keymaps.c vi_mode.c parens.c rltty.c complete.c \ @@ -10,8 +10,8 @@ HDRS= readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h rlconf.h \ rltypedefs.h SUBDIR= doc CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -LDADD+= -L${BSDOBJDIR}/lib/libcurses -ltermcap -DPADD+= ${LIBTERMCAP} +LDADD+= -L${BSDOBJDIR}/lib/libcurses -lcurses +DPADD+= ${LIBCURSES} includes: ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index 0aea2d4ae31..92849611751 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2018/11/14 20:43:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.32 2019/01/15 01:54:00 yasuoka Exp $ # $NetBSD: Makefile,v 1.41 2010/02/03 15:34:43 roy Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 @@ -11,8 +11,8 @@ SRCS = chared.c chartype.c common.c el.c eln.c emacs.c filecomplete.c \ MAN= editline.3 editrc.5 editline.7 -LDADD+= -L${BSDOBJDIR}/lib/libcurses -ltermcap -DPADD+= ${LIBTERMCAP} +LDADD+= -L${BSDOBJDIR}/lib/libcurses -lcurses +DPADD+= ${LIBCURSES} LIBEDITDIR?=${.CURDIR} |