pppd: Fix a stack variable overflow in MSCHAP-v2

[ppp.git] / pppd / plugins / Makefile.linux

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index a7cf5d82edf8d43ee6d42d12903b95527c6a9f21..0a7ec7badb2a62ec71ed9343b3aa6ed07246b00d 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,12 +1,18 @@
-CC     = gcc
-CFLAGS = -g -O2 -I.. -I../../include -fPIC
+#CC    = gcc
+COPTS  = -O2 -g
+CFLAGS = $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS        = -shared
-INSTALL        = install -o root
+INSTALL        = install
 
-SUBDIRS := rp-pppoe
+DESTDIR = $(INSTROOT)@DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+SUBDIRS := rp-pppoe pppoatm pppol2tp
 # Uncomment the next line to include the radius authentication plugin
-# SUBDIRS += radius
-PLUGINS := minconn.so passprompt.so passwordfd.so
+SUBDIRS += radius
+PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
 
 # include dependencies if present
 ifeq (.depend,$(wildcard .depend))
@@ -20,13 +26,11 @@ all:        $(PLUGINS)
        $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
 
 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
-LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION)
 
 install: $(PLUGINS)
        $(INSTALL) -d $(LIBDIR)
        $(INSTALL) $? $(LIBDIR)
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL=$(INSTALL) \
-                               LIBDIR=$(LIBDIR) install; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
 
 clean:
        rm -f *.o *.so *.a