1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
*** info/terminal.c.orig Tue Jul 29 17:42:05 1997
--- info/terminal.c Sat Nov 15 17:07:42 1997
***************
*** 31,43 ****
#ifdef HAVE_NCURSES_TERMCAP_H
#include <ncurses/termcap.h>
#else
! #ifdef HAVE_TERMCAP_H
#include <termcap.h>
#else
/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
Unfortunately, PC is a global variable used by the termcap library. */
#undef PC
/* Termcap requires these variables, whether we access them or not. */
char *BC, *UP;
char PC; /* Pad character */
--- 31,47 ----
#ifdef HAVE_NCURSES_TERMCAP_H
#include <ncurses/termcap.h>
#else
! #if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__)
#include <termcap.h>
#else
/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
Unfortunately, PC is a global variable used by the termcap library. */
#undef PC
+ #if defined(__NetBSD__)
+ #include <termcap.h>
+ #endif
+
/* Termcap requires these variables, whether we access them or not. */
char *BC, *UP;
char PC; /* Pad character */
***************
*** 114,125 ****
--- 118,135 ----
/* Although I can't find any documentation that says this is supposed to
return its argument, all the code I've looked at (termutils, less)
does so, so fine. */
+ #ifdef __NetBSD__
+ void
+ #else
static int
+ #endif
output_character_function (c)
int c;
{
putc (c, stdout);
+ #ifndef __NetBSD__
return c;
+ #endif
}
/* Macro to send STRING to the terminal. */
--- util/Makefile.in 1998/02/13 13:13:54 1.1
+++ util/Makefile.in 1998/02/13 13:14:34
@@ -40,7 +40,7 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
transform = @program_transform_name@
NORMAL_INSTALL = true
@@ -253,7 +253,7 @@
all: Makefile $(PROGRAMS) $(SCRIPTS)
install-strip:
- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
installdirs:
$(mkinstalldirs) $(bindir) $(bindir)
|
