X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fpppoe%2FMakefile.linux;fp=pppd%2Fplugins%2Fpppoe%2FMakefile.linux;h=301130238d51a06c110166e6a0e1430c10ff2e77;hb=750475927f15964be39a8bdda8ea2f57c764f846;hp=b9698710dddc4e3260d538b97392fd6a962bc12b;hpb=6cc7077fffa65c81a7b13c200e666c35419b8265;p=ppp.git

diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
index b969871..3011302 100644
--- a/pppd/plugins/pppoe/Makefile.linux
+++ b/pppd/plugins/pppoe/Makefile.linux
@@ -16,12 +16,13 @@ CROSS_COMPILE=@CROSS_COMPILE@
 CC=$(CROSS_COMPILE)@CC@
 COPTS=@CFLAGS@
 
-DESTDIR = $(INSTROOT)@DESTDIR@
+PREFIX = @DESTDIR@
+DESTDIR = $(INSTROOT)$(PREFIX)
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
-
-PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+LIBDIR = $(INSTROOT)@LIBDIR@
+VERSION = @VERSION@
+PLUGINDIR= $(LIBDIR)/pppd/$(VERSION)
 
 INSTALL	= install
 LN_S	= ln -sf
@@ -42,10 +43,10 @@ pppoe.so: plugin.o discovery.o if.o common.o
 	$(CC) $(LDFLAGS) -o pppoe.so -shared plugin.o discovery.o if.o common.o
 
 install: all
-	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -c -m 755 pppoe.so $(LIBDIR)
+	$(INSTALL) -d -m 755 $(PLUGINDIR)
+	$(INSTALL) -c -m 755 pppoe.so $(PLUGINDIR)
 	# Symlink for backward compatibility
-	$(LN_S) pppoe.so $(LIBDIR)/rp-pppoe.so
+	$(LN_S) pppoe.so $(PLUGINDIR)/rp-pppoe.so
 	$(INSTALL) -d -m 755 $(BINDIR)
 	$(INSTALL) -c -m 755 pppoe-discovery $(BINDIR)
 	$(INSTALL) -c -m 644 pppoe-discovery.8 $(MANDIR)