Removing dead code per review by James Carlson

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

diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
index 7981a9549a4ad5f40d2a686dd909d6f976ace5b8..0aa285808ccba3c43da189fac3ca8f95ed9af449 100644 (file)
--- a/pppd/plugins/pppol2tp/Makefile.linux
+++ b/pppd/plugins/pppol2tp/Makefile.linux
@@ -1,15 +1,17 @@
-#CC    = gcc
-COPTS  = -O2 -g
-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
-LDFLAGS_SHARED = -shared
-INSTALL        = install
-
 #***********************************************************************
+CROSS_COMPILE=@CROSS_COMPILE@
+CC=$(CROSS_COMPILE)@CC@
+COPTS=@CFLAGS@
 
-DESTDIR = @DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+PREFIX = @DESTDIR@
+DESTDIR = $(INSTROOT)$(PREFIX)
+LIBDIR = $(INSTROOT)@LIBDIR@
+VERSION = @VERSION@
+PLUGINDIR = $(LIBDIR)/pppd/$(VERSION)
 
-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
+LDFLAGS_SHARED = -shared
+INSTALL        = install
 
 PLUGINS := pppol2tp.so openl2tp.so
 
@@ -19,8 +21,8 @@ all: $(PLUGINS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $^ $(LIBS)
 
 install: all
-       $(INSTALL) -d -m 755 $(LIBDIR)
-       $(INSTALL) -c -m 755 $(PLUGINS) $(LIBDIR)
+       $(INSTALL) -d -m 755 $(PLUGINDIR)
+       $(INSTALL) -c -m 755 $(PLUGINS) $(PLUGINDIR)
 
 clean:
        rm -f *.o *.so