unchanged: ================================================================================ --- ppp-2.4.4/chat/Makefile.linux +++ ppp-2.4.4/chat/Makefile.linux @@ -10,7 +10,7 @@ CDEF4= -DFNDELAY=O_NDELAY # Old name value CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) -COPTS= -O2 -g -pipe +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall $(CDEFS) CFLAGS= $(COPTS) $(CDEFS) INSTALL= install @@ -25,8 +25,8 @@ install: chat mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) + $(INSTALL) chat $(BINDIR) + $(INSTALL) -m 644 chat.8 $(MANDIR) clean: rm -f chat.o chat *~ --- ppp-2.4.4/pppd/Makefile.linux +++ ppp-2.4.4/pppd/Makefile.linux @@ -32,8 +32,10 @@ # CC = gcc # -COPTS = -O2 -pipe -Wall -g -LIBS = +CC = gcc +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall +LIBS = -lutil + # Uncomment the next 2 lines to include support for Microsoft's # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. @@ -200,10 +202,8 @@ install: pppd mkdir -p $(BINDIR) $(MANDIR) $(EXTRAINSTALL) - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR) + $(INSTALL) -m 755 pppd $(BINDIR)/pppd + $(INSTALL) -m 644 pppd.8 $(MANDIR)/ pppd: $(PPPDOBJS) $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) --- ppp-2.4.4/pppd/plugins/Makefile.linux +++ ppp-2.4.4/pppd/plugins/Makefile.linux @@ -1,5 +1,5 @@ CC = gcc -COPTS = -O2 -g +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall CFLAGS = $(COPTS) -I.. -I../../include -fPIC LDFLAGS = -shared INSTALL = install --- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux +++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux @@ -24,7 +24,7 @@ # Version is set ONLY IN THE MAKEFILE! Don't delete this! VERSION=3.3 -COPTS=-O2 -g +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall CFLAGS=$(COPTS) -I../../../include/linux all: rp-pppoe.so pppoe-discovery @@ -39,7 +39,7 @@ install: all $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) + $(INSTALL) rp-pppoe.so $(LIBDIR) $(INSTALL) -d -m 755 $(BINDIR) $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) --- ppp-2.4.4/pppdump/Makefile.linux +++ ppp-2.4.4/pppdump/Makefile.linux @@ -2,7 +2,7 @@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 -CFLAGS= -O -I../include/net +CFLAGS= -O2 -pipe -Wall -I../include/net OBJS = pppdump.o bsd-comp.o deflate.o zlib.o INSTALL= install @@ -17,5 +17,5 @@ install: mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) + $(INSTALL) pppdump $(BINDIR) + $(INSTALL) -m 444 pppdump.8 $(MANDIR) --- ppp-2.4.4/pppstats/Makefile.linux +++ ppp-2.4.4/pppstats/Makefile.linux @@ -9,8 +9,8 @@ PPPSTATSRCS = pppstats.c PPPSTATOBJS = pppstats.o -#CC = gcc -COPTS = -O +CC = gcc +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall COMPILE_FLAGS = -I../include LIBS = @@ -22,8 +22,8 @@ install: pppstats -mkdir -p $(MANDIR) - $(INSTALL) -s -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + $(INSTALL) pppstats $(BINDIR) + $(INSTALL) -m 444 pppstats.8 $(MANDIR) pppstats: $(PPPSTATSRCS) $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)