summaryrefslogtreecommitdiff
path: root/package/ppp/patches/patch-pppd_plugins_Makefile_linux
diff options
context:
space:
mode:
Diffstat (limited to 'package/ppp/patches/patch-pppd_plugins_Makefile_linux')
-rw-r--r--package/ppp/patches/patch-pppd_plugins_Makefile_linux32
1 files changed, 25 insertions, 7 deletions
diff --git a/package/ppp/patches/patch-pppd_plugins_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
index 9f78f3d19..8351654c7 100644
--- a/package/ppp/patches/patch-pppd_plugins_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
@@ -1,29 +1,47 @@
--- ppp-2.4.5.orig/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/Makefile.linux 2011-01-16 17:14:34.000000000 +0100
-@@ -1,13 +1,8 @@
++++ ppp-2.4.5/pppd/plugins/Makefile.linux 2011-01-21 21:29:58.118658260 +0100
+@@ -1,13 +1,13 @@
-#CC = gcc
-COPTS = -O2 -g
-CFLAGS = $(COPTS) -I.. -I../../include -fPIC
-LDFLAGS = -shared
-INSTALL = install
-+include ../../makedefs.linux
++#
++# makefile for pppd/plugins
++#
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++include ../../Makedefs.com
++
+CPPFLAGS += -I.. -I../../include
-+CFLAGS += -fPIC
++CFLAGS += -fPIC
+LDFLAGS += -shared
SUBDIRS := rp-pppoe pppoatm pppol2tp
# Uncomment the next line to include the radius authentication plugin
-@@ -23,7 +18,7 @@ all: $(PLUGINS)
+@@ -23,12 +23,10 @@ all: $(PLUGINS)
for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
%.so: %.c
- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-+ $(CC) -o $@ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $^
+-
+-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
+ install: $(PLUGINS)
+- $(INSTALL) -d $(LIBDIR)
++ $(INSTALL) -d -m 755 $(LIBDIR)
+ $(INSTALL) $? $(LIBDIR)
+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
+@@ -37,5 +35,4 @@ clean:
+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
+
+ depend:
+- $(CPP) -M $(CFLAGS) *.c >.depend
+- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done
++ $(CPP) -M $(CPPFLAGS) *.c >.depend