diff options
| author |   tholo <tholo@openbsd.org> | 2002-06-24 18:03:30 +0000 |
|---|---|---|
| committer | tholo <tholo@openbsd.org> | 2002-06-24 18:03:30 +0000 |
| commit | 803777fde2356407fb28e4e834a0e762ad7ec1ac (patch) | |
| tree | 410c5cda8c93b0c749ba364fa357142985df90d3 | |
| parent | oops. don't initialize wi_flags and wi_hostap_info here; fixes sparc. (diff) | |
| download | wireguard-openbsd-803777fde2356407fb28e4e834a0e762ad7ec1ac.tar.xz wireguard-openbsd-803777fde2356407fb28e4e834a0e762ad7ec1ac.zip | |
Properly install links for debug libraries; ok deraadt@
| -rw-r--r-- | lib/libcurses/Makefile | 11 | ||||
| -rw-r--r-- | lib/libocurses/Makefile | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index 2d62acae63a..a3e76e6c581 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2000/11/08 22:09:24 deraadt Exp $ +# $OpenBSD: Makefile,v 1.49 2002/06/24 18:03:30 tholo Exp $ # Uncomment this to enable tracing in libcurses #CURSESTRACE=-DTRACE @@ -237,13 +237,20 @@ names.c codes.c: ${.CURDIR}/tinfo/MKnames.awk unctrl.c: ${.CURDIR}/base/MKunctrl.awk echo | ${AWK} -f ${.CURDIR}/base/MKunctrl.awk > ${.TARGET} +.include <bsd.own.mk> + # Link libtermlib, libtermcap to libcurses so we don't break people's Makefiles afterinstall: - -cd ${DESTDIR}/usr/lib; \ + -cd ${DESTDIR}${LIBDIR}; \ for i in ${_LIBS}; do \ ln -f $$i `echo $$i | sed 's/curses/termlib/'`; \ ln -f $$i `echo $$i | sed 's/curses/termcap/'`; \ done +.if (${DEBUGLIBS:L} == "yes") + -cd ${DESTDIR}${LIBDIR}/debug; \ + ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/termlib/'`.a; \ + ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/termcap/'`.a +.endif .include <bsd.lib.mk> diff --git a/lib/libocurses/Makefile b/lib/libocurses/Makefile index 397dfb86026..b84a8f75284 100644 --- a/lib/libocurses/Makefile +++ b/lib/libocurses/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 1998/12/02 15:45:43 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/06/24 18:03:30 tholo Exp $ CFLAGS+=#-DTFILE=\"/dev/ttyp0\" CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR} @@ -22,12 +22,18 @@ includes: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ curses.h ${DESTDIR}/usr/include/ocurses.h +.include <bsd.own.mk> + # Link libotermcap to libocurses for programs that need full compatibility # with the old termcap behavior afterinstall: - -cd ${DESTDIR}/usr/lib; \ + -cd ${DESTDIR}${LIBDIR}; \ for i in ${_LIBS}; do \ ln -f $$i `echo $$i | sed 's/ocurses/otermcap/'`; \ done +.if (${DEBUGLIBS:L} == "yes") + -cd ${DESTDIR}${LIBDIR}/debug; \ + ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/ocurses/otermcap/'`.a +.endif .include <bsd.lib.mk> |