X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fplugins%2FMakefile.linux;h=2fabeba80eacb436014d472ef307cdb90746b0ba;hp=320f708c04447b7c8b3bffb2907095e98f84c390;hb=5d490c4106f4a34864c980b925e183cf3bf575e2;hpb=6050706a2fb9bfd9013576b002f73d5a6a5ff591

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