X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2FMakefile.linux;h=b52f284278008247a74935b64e12c293393c9240;hb=ef0a499148f81d19ada42650cff5b969bf7cad7f;hp=2fabeba80eacb436014d472ef307cdb90746b0ba;hpb=b289ec4c473338c67bce0cb5712616da2d2493e8;p=ppp.git

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index 2fabeba..b52f284 100644
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -2,12 +2,17 @@ CC	= gcc
 COPTS	= -O2 -g
 CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS	= -shared
-INSTALL	= install -o root
+INSTALL	= install
 
-SUBDIRS := rp-pppoe
+DESTDIR = @DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+SUBDIRS := rp-pppoe pppoatm radius
 # Uncomment the next line to include the radius authentication plugin
 # SUBDIRS += radius
-PLUGINS := minconn.so passprompt.so passwordfd.so
+PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
 
 # include dependencies if present
 ifeq (.depend,$(wildcard .depend))
@@ -21,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