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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
$NetBSD: patch-aa,v 1.8 2004/06/07 14:47:34 minskim Exp $
--- Makefile.orig 2003-06-28 09:03:03.000000000 -0500
+++ Makefile
@@ -12,12 +12,12 @@
# Compilation/installation vars (global for all following sections) |
#=====================================================================
#
-CC = gcc
-PREFIX = /usr/local
-X11PREFIX = /usr/X11R6
-INCX11 = $(X11PREFIX)/include
-LIBX11 = $(X11PREFIX)/lib
-INCFORMS = $(X11PREFIX)/include
+#CC = gcc
+#PREFIX = /usr/local
+#X11PREFIX = /usr/X11R6
+INCX11 = $(X11BASE)/include
+LIBX11 = $(X11BASE)/lib
+INCFORMS = $(X11PREFIX)/include/X11
LIBFORMS = $(X11PREFIX)/lib
MODEM_DEV = modem
MODEM_PATH = /dev/$(MODEM_DEV)
@@ -29,26 +29,26 @@ MODEM_PATH = /dev/$(MODEM_DEV)
# Normal (i.e. SuSE-[678].x) vars; for SuSE-5.x use the lines which
# DO NOT include -lcrypt for EXTRALIBS and -DGLIBC2 for EXTRADEFS.
#-------------------------------------------------------------------
-BINX11 = $(X11PREFIX)/bin
-USRLOCAL = $(PREFIX)/bin
-SBINDIR = /usr/sbin
-VARRUN = /var/run
-USRLIBPPP = /etc/ppp
-OPTSDIR = /etc/ppp
-MANDIR = $(X11PREFIX)/man/man1
-ETCPPP = /etc/ppp
-INSTPPPDIR = $(ETCPPP)
-PPPDLCKDIR = /var/lock
-DESTDIR =
-GROUP = uucp
-CCFLAGS = -Wall -O
-EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 -DHAVE_STRERROR
+#BINX11 = $(X11PREFIX)/bin
+#USRLOCAL = $(PREFIX)/bin
+#SBINDIR = /usr/sbin
+#VARRUN = /var/run
+#USRLIBPPP = /etc/ppp
+#OPTSDIR = /etc/ppp
+#MANDIR = $(X11PREFIX)/man/man1
+#ETCPPP = /etc/ppp
+#INSTPPPDIR = $(ETCPPP)
+#PPPDLCKDIR = /var/lock
+#DESTDIR =
+#GROUP = uucp
+#CCFLAGS = -Wall -O
+#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 -DHAVE_STRERROR
#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\"
-EXTRALIBS = -lcrypt
+#EXTRALIBS = -lcrypt
#EXTRALIBS =
-LINKX11 =
-LINKFORMS = -L$(LIBFORMS) -lforms
-INSTALL = install
+#LINKX11 =
+#LINKFORMS = -L$(LIBFORMS) -lforms
+#INSTALL = install
#
# Debian vars (if your Debian distribution is relatively
# old and does not use glibc2, use the lines which DO NOT
@@ -187,25 +187,25 @@ INSTALL = install
#
# NetBSD vars
#-------------
-#BINX11 = $(X11PREFIX)/bin
-#USRLOCAL = $(BINX11)
-#SBINDIR = /usr/sbin
-#VARRUN = /var/run
-#USRLIBPPP = $(PREFIX)/libexec
-#MANDIR = $(PREFIX)/man/man1
-#ETCPPP = /etc/ppp
-#OPTSDIR = $(ETCPPP)
+BINX11 = $(X11PREFIX)/bin
+USRLOCAL = $(BINX11)
+SBINDIR = /usr/sbin
+VARRUN = /var/run
+USRLIBPPP = $(PREFIX)/libexec
+MANDIR = $(PREFIX)/man/man1
+ETCPPP = /etc/ppp
+OPTSDIR = $(ETCPPP)
#INSTPPPDIR = $(ETCPPP)
-##INSTPPPDIR = $(PREFIX)/share/examples/xisp
-#PPPDLCKDIR = /var/spool/lock
-#DESTDIR =
-#GROUP = dialer
-#CCFLAGS = -Wall -O
-#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
-#EXTRALIBS = -lcrypt
-#LINKX11 = -Wl,-R$(LIBX11)
-#LINKFORMS = -L$(LIBFORMS) -lforms
-#INSTALL = /usr/bin/install
+INSTPPPDIR = $(PREFIX)/share/examples/xisp
+PPPDLCKDIR = /var/spool/lock
+DESTDIR =
+GROUP = dialer
+CCFLAGS = -Wall -O
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
+EXTRALIBS = -lcrypt
+LINKX11 = -Wl,-R$(LIBX11)
+LINKFORMS = -Wl,-R$(LIBFORMS) -L$(LIBFORMS) -lforms
+INSTALL = /usr/bin/install
#
# FreeBSD vars
#-------------
@@ -325,19 +325,19 @@ network.o: network.h network.c
$(CC) $(CCOPTS) -c network.c
xispdial: xispdial.o $(SHAREOBJ)
- $(CC) $(CCOPTS) -o xispdial xispdial.o $(SHAREOBJ)
+ $(CC) $(CCOPTS) $(LINKX11) -o xispdial xispdial.o $(SHAREOBJ)
xispdial.o: xispdial.c common.h version.h
$(CC) $(CCOPTS) -c xispdial.c
xisprccv: xisprccv.o pcode.o $(SHAREOBJ)
- $(CC) -o xisprccv xisprccv.o pcode.o $(SHAREOBJ) $(EXTRALIBS) -lm
+ $(CC) -o xisprccv xisprccv.o pcode.o $(SHAREOBJ) $(EXTRALIBS) $(LINKX11) -lm
xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h
$(CC) $(CCOPTS) -c xisprccv.c
xispterm: xispterm.h xispterm.c
- $(CC) $(CCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \
+ $(CC) $(CCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \
$(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm
rcio.o: rcio.h rcio.c common.h version.h
@@ -350,7 +350,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
$(CC) $(CCOPTS) -c xisp_euidaccess.c
xispid: xispid.c
- $(CC) $(CCOPTS) -o xispid xispid.c
+ $(CC) $(CCOPTS) $(LINKX11) -o xispid xispid.c
xisp.1: xisp.man
sed -e s,@ETCPPP@,$(DESTDIR)$(ETCPPP),g \
|
