diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:45:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:45:05 +0100 |
| commit | 6c3f7bc5593343058ab91c0b504fd67d3c0d1269 (patch) | |
| tree | f57aae2e39a3e60895f08b6e93e95d1d5af1c8c5 /package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux | |
| parent | 52549131197cd42dd61b50721e3f68e3d7585ec7 (diff) | |
| parent | 3953de124e87ce3b594fd861b6f111b2df706753 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux')
| -rw-r--r-- | package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux index 4c46c5971..481f1e41c 100644 --- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux @@ -1,41 +1,45 @@ --- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-16 21:32:19.000000000 +0100 -@@ -1,13 +1,10 @@ ++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-21 21:30:05.208658673 +0100 +@@ -1,29 +1,27 @@ -#CC = gcc -COPTS = -O2 -g -CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC -LDFLAGS = -shared -INSTALL = install -+include ../../../makedefs.linux ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -#*********************************************************************** -+CPPFLAGS += -I. -I../.. -I../../../include -+#CFLAGS += -fPIC -+#LDFLAGS += -shared ++include ../../../Makedefs.com -DESTDIR = @DESTDIR@ -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++CPPFLAGS += -I. -I../.. -I../../../include ++ifeq (,$(filter -fPIC,$(CFLAGS))) ++CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) ++LDFLAGS += -shared ++endif + +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +#*********************************************************************** - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + PLUGINS := pppol2tp.so openl2tp.so -@@ -16,7 +13,11 @@ PLUGINS := pppol2tp.so openl2tp.so all: $(PLUGINS) %.so: %.o - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+ echo $(LDFLAGS) -+ -+%.o: %.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< - install: all +-install: all ++install: $(PLUGINS) $(INSTALL) -d -m 755 $(LIBDIR) -@@ -25,5 +26,4 @@ install: all +- $(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR) ++ $(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR) + clean: rm -f *.o *.so - +- -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< -+.PHONY: clean |