diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1994-10-10 00:32:19 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1994-10-10 00:32:19 +0000 |
| commit | af1f5928f10a096e2af737fd5e91bf7b9e217a68 (patch) | |
| tree | cca0741c56933635d24f4f05fed1f171fb1026ff | |
| parent | 6a5cea9ba269a8fef93f9839d49589717187c9d8 (diff) | |
| download | src-af1f5928f10a096e2af737fd5e91bf7b9e217a68.tar.gz src-af1f5928f10a096e2af737fd5e91bf7b9e217a68.zip | |
Merge term.h and nterm.h
Notes
Notes:
svn path=/head/; revision=3481
| -rw-r--r-- | lib/libmytinfo/Makefile | 12 | ||||
| -rw-r--r-- | lib/libmytinfo/term.h | 6 | ||||
| -rw-r--r-- | lib/libmytinfo/term.tail | 6 |
3 files changed, 19 insertions, 5 deletions
diff --git a/lib/libmytinfo/Makefile b/lib/libmytinfo/Makefile index 71541d092af5..0164542c8292 100644 --- a/lib/libmytinfo/Makefile +++ b/lib/libmytinfo/Makefile @@ -1,7 +1,7 @@ # Makefile for libmytinfo # Use 'make update_term_h' manually after changing internal # mytinfo structures -# $Id: Makefile,v 1.3 1994/10/09 17:50:50 ache Exp $ +# $Id: Makefile,v 1.4 1994/10/09 18:38:59 ache Exp $ LIB= mytinfo SRCS= addstr.c binorder.c buildpath.c caplist.c capsort.c compar.c\ @@ -18,10 +18,12 @@ CAPS= 1000 update_term_h: ${.CURDIR}/term.h beforeinstall: - -cmp -s ${.CURDIR}/term.h ${DESTDIR}/usr/include/term.h > \ - /dev/null 2>&1 || \ - $(INSTALL) $(COPY) -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/term.h \ - ${DESTDIR}/usr/include + -cmp -s ${.CURDIR}/term.h ${DESTDIR}/usr/include/term.h && \ + cmp -s ${.CURDIR}/term.h ${DESTDIR}/usr/include/nterm.h || \ + ( $(INSTALL) $(COPY) -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/term.h ${DESTDIR}/usr/include; \ + rm -f ${DESTDIR}/usr/include/nterm.h; \ + ln ${DESTDIR}/usr/include/term.h ${DESTDIR}/usr/include/nterm.h ) capsort.c: mkcapsort ./mkcapsort > capsort.c diff --git a/lib/libmytinfo/term.h b/lib/libmytinfo/term.h index 8386a9fa53ff..a7b2704f9bac 100644 --- a/lib/libmytinfo/term.h +++ b/lib/libmytinfo/term.h @@ -655,4 +655,10 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define ERR (-1) #endif +/* Compatibility */ +#define Filedes fd +#define Ottyb shell_mode +#define Nttyb prog_mode +#define TTY struct termios + #endif /* _TERM_H_ */ diff --git a/lib/libmytinfo/term.tail b/lib/libmytinfo/term.tail index bba7264200ff..603655768fad 100644 --- a/lib/libmytinfo/term.tail +++ b/lib/libmytinfo/term.tail @@ -128,4 +128,10 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define ERR (-1) #endif +/* Compatibility */ +#define Filedes fd +#define Ottyb shell_mode +#define Nttyb prog_mode +#define TTY struct termios + #endif /* _TERM_H_ */ |