X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fplugins%2FMakefile.linux;h=0cc916b96763997f79449b79882f056c34cf9b08;hp=320f708c04447b7c8b3bffb2907095e98f84c390;hb=dbfeebc9adcf76a50c1d4e9035d5d481914edb43;hpb=fecefef95ccdad604afe51f954f1e25861f022e6

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index 320f708..0cc916b 100644
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -3,7 +3,7 @@ CFLAGS	= -g -O2 -I.. -I../../include -D_linux_=1 -fPIC
 LDFLAGS	= -shared
 INSTALL	= install -o root
 
-SUBDIRS = pppoe
+SUBDIRS = rp-pppoe
 PLUGINS = minconn.so passprompt.so
 
 # include dependencies if present
@@ -18,12 +18,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