1 diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
2 --- ppp-2.4.4.orig/chat/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
3 +++ ppp-2.4.4.make/chat/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
5 CDEF4= -DFNDELAY=O_NDELAY # Old name value
6 CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
9 +COPTS= $(OPT_FLAGS) -g -pipe
10 CFLAGS= $(COPTS) $(CDEFS)
17 - $(CC) -o chat chat.o
18 + $(CC) $(OPTLDFLAGS) -o chat chat.o
21 $(CC) -c $(CFLAGS) -o chat.o chat.c
24 mkdir -p $(BINDIR) $(MANDIR)
25 - $(INSTALL) -s -c chat $(BINDIR)
26 + $(INSTALL) -c chat $(BINDIR)
27 $(INSTALL) -c -m 644 chat.8 $(MANDIR)
30 diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4.make/pppd/Makefile.linux
31 --- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
32 +++ ppp-2.4.4.make/pppd/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
37 -COPTS = -O2 -pipe -Wall -g
38 +COPTS = $(OPT_FLAGS) -pipe -Wall -g
39 +LDFLAGS += $(OPTLDFLAGS)
42 # Uncomment the next 2 lines to include support for Microsoft's
53 # Enable Microsoft proprietary Callback Control Protocol
57 # Enable EAP SRP-SHA1 authentication (requires libsrp)
61 mkdir -p $(BINDIR) $(MANDIR)
63 - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
64 - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
65 - chmod o-rx,u+s $(BINDIR)/pppd; fi
66 + $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
67 $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
70 diff -Nur ppp-2.4.4.orig/pppd/plugins/Makefile.linux ppp-2.4.4.make/pppd/plugins/Makefile.linux
71 --- ppp-2.4.4.orig/pppd/plugins/Makefile.linux 2006-06-04 07:04:14.000000000 +0200
72 +++ ppp-2.4.4.make/pppd/plugins/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
76 +COPTS = $(OPT_FLAGS) -g
77 CFLAGS = $(COPTS) -I.. -I../../include -fPIC
79 +LDFLAGS = $(OPTLDFLAGS) -shared
82 DESTDIR = $(INSTROOT)@DESTDIR@
83 diff -Nur ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4.make/pppd/plugins/pppoatm/Makefile.linux
84 --- ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 02:12:10.000000000 +0100
85 +++ ppp-2.4.4.make/pppd/plugins/pppoatm/Makefile.linux 2006-08-04 03:15:04.000000000 +0200
89 $(PLUGIN): $(PLUGIN_OBJS)
90 - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
91 + $(CC) $(OPTLDFLAGS) $(CFLAGS) -o $@ -shared $^ $(LIBS)
94 $(INSTALL) -d -m 755 $(LIBDIR)
95 diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux
96 --- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux 2006-06-04 07:04:14.000000000 +0200
97 +++ ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux 2006-08-04 03:13:58.000000000 +0200
101 PLUGIN=radius.so radattr.so radrealms.so
102 -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
103 +CFLAGS=-I. -I../.. -I../../../include $(OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
105 # Uncomment the next line to include support for Microsoft's
106 # MS-CHAP authentication protocol.
110 $(INSTALL) -d -m 755 $(LIBDIR)
111 - $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
112 - $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
113 - $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
114 + $(INSTALL) -c -m 755 radius.so $(LIBDIR)
115 + $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
116 + $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
117 $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
118 $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
120 radius.so: radius.o libradiusclient.a
121 - $(CC) -o radius.so -shared radius.o libradiusclient.a
122 + $(CC) $(OPTLDFLAGS) -o radius.so -shared radius.o libradiusclient.a
124 radattr.so: radattr.o
125 - $(CC) -o radattr.so -shared radattr.o
126 + $(CC) $(OPTLDFLAGS) -o radattr.so -shared radattr.o
128 radrealms.so: radrealms.o
129 - $(CC) -o radrealms.so -shared radrealms.o
130 + $(CC) $(OPTLDFLAGS) -o radrealms.so -shared radrealms.o
132 CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
133 clientid.o sendserver.o lock.o util.o md5.o
134 diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux
135 --- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
136 +++ ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux 2006-08-04 03:14:35.000000000 +0200
138 # Version is set ONLY IN THE MAKEFILE! Don't delete this!
142 +COPTS=$(OPT_FLAGS) -g
143 CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
144 all: rp-pppoe.so pppoe-discovery
146 pppoe-discovery: pppoe-discovery.o debug.o
147 - $(CC) -o pppoe-discovery pppoe-discovery.o debug.o
148 + $(CC) $(OPTLDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
150 pppoe-discovery.o: pppoe-discovery.c
151 $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
153 $(CC) $(CFLAGS) -c -o debug.o debug.c
155 rp-pppoe.so: plugin.o discovery.o if.o common.o
156 - $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
157 + $(CC) $(OPTLDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
160 $(INSTALL) -d -m 755 $(LIBDIR)
161 - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
162 + $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
163 $(INSTALL) -d -m 755 $(BINDIR)
164 - $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
165 + $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
168 rm -f *.o *.so pppoe-discovery
169 diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4.make/pppdump/Makefile.linux
170 --- ppp-2.4.4.orig/pppdump/Makefile.linux 2006-06-04 07:04:14.000000000 +0200
171 +++ ppp-2.4.4.make/pppdump/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
173 BINDIR = $(DESTDIR)/sbin
174 MANDIR = $(DESTDIR)/share/man/man8
176 -CFLAGS= -O -I../include/net
177 +CFLAGS= $(OPT_FLAGS) -I../include/net
178 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
185 - $(CC) -o pppdump $(OBJS)
186 + $(CC) $(OPTLDFLAGS) -o pppdump $(OBJS)
189 rm -f pppdump $(OBJS) *~
192 mkdir -p $(BINDIR) $(MANDIR)
193 - $(INSTALL) -s -c pppdump $(BINDIR)
194 + $(INSTALL) -c pppdump $(BINDIR)
195 $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
196 diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4.make/pppstats/Makefile.linux
197 --- ppp-2.4.4.orig/pppstats/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
198 +++ ppp-2.4.4.make/pppstats/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
200 PPPSTATOBJS = pppstats.o
204 +COPTS = $(OPT_FLAGS)
205 COMPILE_FLAGS = -I../include
212 - $(INSTALL) -s -c pppstats $(BINDIR)
213 + $(INSTALL) -c pppstats $(BINDIR)
214 $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
216 pppstats: $(PPPSTATSRCS)
217 - $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
218 + $(CC) $(CFLAGS) $(OPTLDFLAGS) -o pppstats pppstats.c $(LIBS)
221 rm -f pppstats *~ #* core