summaryrefslogtreecommitdiff
path: root/package/olsrd/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/olsrd/patches')
-rw-r--r--package/olsrd/patches/patch-Makefile11
-rw-r--r--package/olsrd/patches/patch-make_Makefile_linux13
2 files changed, 23 insertions, 1 deletions
diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile
new file mode 100644
index 000000000..bfbc2e26f
--- /dev/null
+++ b/package/olsrd/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- olsrd-0.5.6-r2.orig/Makefile 2008-10-03 14:45:06.000000000 +0200
++++ olsrd-0.5.6-r2/Makefile 2009-06-13 14:02:52.000000000 +0200
+@@ -143,7 +143,7 @@ rpm:
+
+ # This is quite ugly but at least it works
+ ifeq ($(OS),linux)
+-SUBDIRS = $(notdir $(shell find lib -maxdepth 2 -name Makefile -not -path lib/Makefile -printf "%h\n"|sort))
++SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo mini nameservice pgraph quagga secure tas txtinfo
+ else
+ ifeq ($(OS),win32)
+ SUBDIRS := dot_draw httpinfo mini pgraph secure txtinfo
diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux
index 5ea807341..5099a3d83 100644
--- a/package/olsrd/patches/patch-make_Makefile_linux
+++ b/package/olsrd/patches/patch-make_Makefile_linux
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- olsrd-0.5.6-r2.orig/make/Makefile.linux 2008-10-03 14:45:07.000000000 +0200
-+++ olsrd-0.5.6-r2/make/Makefile.linux 2008-12-08 03:23:50.000000000 +0100
++++ olsrd-0.5.6-r2/make/Makefile.linux 2009-06-13 14:10:25.000000000 +0200
@@ -4,7 +4,7 @@
ARCH := $(shell uname -m)
@@ -10,3 +10,14 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
SRCS += $(wildcard src/linux/*.c src/unix/*.c)
HDRS += $(wildcard src/linux/*.h src/unix/*.h)
+@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux
+ LIBS +=
+
+ PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
+-INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
+- /sbin/ldconfig -n $(LIBDIR)
++INSTALL_LIB = install -d -m 755 $(LIBDIR); \
++ install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME);
+
+ ifdef OLSRD_PLUGIN
+ GENERATE_PIC = true