3 --- Makefile.orig Mon Oct 26 11:35:01 1998
4 +++ Makefile Thu Dec 3 15:25:01 1998
6 # Compilation/installation vars (global for all following sections) |
7 #=====================================================================
9 -INCX11 = /usr/X11R6/include
10 -LIBX11 = /usr/X11R6/lib
11 -INCFORMS = /usr/X11R6/include/X11
12 -LIBFORMS = /usr/X11R6/lib
13 +X11PREFIX != echo ${X11BASE} | sed "s,^/,,"
14 +BASEPREFIX!= echo ${PREFIX} | sed "s,^/,,"
16 +INCX11 = ${X11BASE}/include
17 +LIBX11 = ${X11BASE}/lib
18 +INCFORMS = ${X11BASE}/include/X11
19 +LIBFORMS = ${X11BASE}/lib
22 #=====================================================================
25 # Normal vars (e.g. Slackware)
26 #------------------------------
27 -BINX11 = usr/X11R6/bin
28 -USRLOCAL = usr/local/bin
31 -USRLIBPPP = usr/lib/ppp
32 -OPTSDIR = usr/lib/ppp
33 -MANDIR = usr/X11R6/man/man1
41 +#BINX11 = usr/X11R6/bin
42 +#USRLOCAL = usr/local/bin
45 +#USRLIBPPP = usr/lib/ppp
46 +#OPTSDIR = usr/lib/ppp
47 +#MANDIR = usr/X11R6/man/man1
62 -#EXTRADEFS = -DSUNOS41x
63 +#EXTRADEFS = -DSUNOS41x -DBROKEN_VSPRINTF=1
64 #EXTRALIBS = -L./SunOS/ufc-crypt -lufc
71 -#EXTRADEFS = -DSUNOS5x
72 +#EXTRADEFS = -DSUNOS5x -DHAVE_STRERROR=1
73 #EXTRALIBS = -lcrypt -lsocket -lnsl
74 #INSTALL = /usr/ucb/install
76 #=====================================================================
78 +#=====================================================================
82 +BINX11 = ${BASEPREFIX}/bin
86 +USRLIBPPP = ${BASEPREFIX}/libexec
87 +OPTSDIR = ${BASEPREFIX}/etc
88 +MANDIR = ${BASEPREFIX}/man/man1
90 +EGDIR = ${BASEPREFIX}/share/examples/xisp
94 +EXTRADEFS = -DHAVE_STRERROR=1
96 +LINKX11 = -Wl,-R${LIBX11}
97 +INSTALL = /usr/bin/install
99 +#=====================================================================
100 # Program configuration options |
101 #=====================================================================
104 all: xisp xispdial xisprccv xispterm xispid
106 xisp: xisp.o pcode.o network.o rcio.o logs.o
107 - gcc -o xisp xisp.o pcode.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) -L$(LIBFORMS) -lforms -lXpm -lX11 -lm
108 + gcc $(LINKX11) -o xisp xisp.o pcode.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) -L$(LIBFORMS) -lforms -lXpm -lX11 -lm
110 xisp.o: xisp.h xisp.c xisp.xpm version.h common.h pcode.h network.h rcio.h logs.h help.c peHelp.c excl.xpm
111 gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c xisp.c
113 gcc $(GCCOPTS) -o xispdial xispdial.c
115 xisprccv: xisprccv.o pcode.o
116 - gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm
117 + gcc $(LINKX11) -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm
119 xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h
120 gcc $(GCCOPTS) -c xisprccv.c
121 @@ -216,29 +242,25 @@
122 $(INSTALL) -g $(GROUP) -m 750 -o root -s xispid $(DESTDIR)/$(USRLOCAL)/xispid
123 # if [ ! -d $(DESTDIR)/$(OPTSDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(OPTSDIR); fi
124 # $(INSTALL) -g $(GROUP) -m 640 -o root options.xisp $(DESTDIR)/$(OPTSDIR)/options.xisp
125 + sed -e s,@ETCPPP@,${DESTDIR}/${ETCPPP},g \
126 + -e s,@USRLIBPPP@,${DESTDIR}/${USRLIBPPP},g \
127 + -e s,@USRLOCAL@,${DESTDIR}/${USRLOCAL},g \
128 + < xisp.man > xisp.1
129 if [ ! -d $(DESTDIR)/$(MANDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(MANDIR); fi
130 - $(INSTALL) -g $(GROUP) -m 644 -o root xisp.man $(DESTDIR)/$(MANDIR)/xisp.1
131 + $(INSTALL) -g $(GROUP) -m 644 -o root xisp.1 $(DESTDIR)/$(MANDIR)/xisp.1
132 sed -e s/__XISPGROUP/$(GROUP)/ \
133 -e sM__XISPIDM/$(DESTDIR)/$(USRLOCAL)/xispidM < ip-up.xisp > ip-up.install
134 sed -e s/__XISPGROUP/$(GROUP)/ \
135 -e sM__XISPIDM/$(DESTDIR)/$(USRLOCAL)/xispidM < ip-down.xisp > ip-down.install
136 - if [ ! -d $(DESTDIR)/$(ETCPPP) ]; then $(INSTALL) -d $(DESTDIR)/$(ETCPPP); fi
137 - if [ -f $(DESTDIR)/$(ETCPPP)/ip-up ]; then \
138 - mv -f $(DESTDIR)/$(ETCPPP)/ip-up $(DESTDIR)/$(ETCPPP)/ip-up.bak; fi
139 - $(INSTALL) -g $(GROUP) -m 750 -o root ip-up.install $(DESTDIR)/$(ETCPPP)/ip-up
140 - if [ -f $(DESTDIR)/$(ETCPPP)/ip-down ]; then \
141 - mv -f $(DESTDIR)/$(ETCPPP)/ip-down $(DESTDIR)/$(ETCPPP)/ip-down.bak; fi
142 - $(INSTALL) -g $(GROUP) -m 750 -o root ip-down.install $(DESTDIR)/$(ETCPPP)/ip-down
143 + if [ ! -d $(DESTDIR)/$(EGDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(EGDIR); fi
144 + $(INSTALL) -g $(GROUP) -m 750 -o root ip-up.install $(DESTDIR)/$(EGDIR)/ip-up
145 + $(INSTALL) -g $(GROUP) -m 750 -o root ip-down.install $(DESTDIR)/$(EGDIR)/ip-down
146 rm -f ip-up.install ip-down.install
147 sed -e s/__DEVICE/$(MODEMDEV)/ < xisp.peers.device > xisp_$(MODEMDEV)
148 sed -e sM__DIALER_PATHM$(DESTDIR)/$(USRLIBPPP)M < xisp.peers.dialer > xisp_dialer
149 - if [ ! -d $(DESTDIR)/$(ETCPPP)/peers ]; then $(INSTALL) -d $(DESTDIR)/$(ETCPPP)/peers; fi
150 - if [ -f $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV) ]; then \
151 - mv -f $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV) $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV).bak; fi
152 - $(INSTALL) -g $(GROUP) -m 640 -o root xisp_$(MODEMDEV) $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV)
153 - if [ -f $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer ]; then \
154 - mv -f $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer.bak; fi
155 - $(INSTALL) -g $(GROUP) -m 640 -o root xisp_dialer $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer
156 + if [ ! -d $(DESTDIR)/$(EGDIR)/peers ]; then $(INSTALL) -d $(DESTDIR)/$(EGDIR)/peers; fi
157 + $(INSTALL) -g $(GROUP) -m 640 -o root xisp_$(MODEMDEV) $(DESTDIR)/$(EGDIR)/peers/xisp_$(MODEMDEV)
158 + $(INSTALL) -g $(GROUP) -m 640 -o root xisp_dialer $(DESTDIR)/$(EGDIR)/peers/xisp_dialer
159 rm -f xisp_$(MODEMDEV) xisp_dialer