X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Folsrd%2FMakefile;h=09c6372498eda5296a9beca570f97e1e4ad789e2;hp=87536333d8949f6eba254f047b76ea83dc960813;hb=0080bbcdfc577b7b0c58ee8e48001ac51a0ba5e4;hpb=a95a8b74c9bcfb098ffaf14575853a8a8ec4e41d

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 87536333d8..09c6372498 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -9,16 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.5.6-rc7
+PKG_VERSION:=0.5.6-r2
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
-PKG_MD5SUM:=10fbf796792d51eda735d171b6c86941
+PKG_MD5SUM:=64b439cde30f48764f02cdd8766aba40
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/olsrd/template
   SECTION:=net
   CATEGORY:=Network
@@ -30,7 +32,7 @@ endef
 define Package/olsrd
   $(call Package/olsrd/template)
   MENU:=1
-  DEPENDS:=libpthread
+  DEPENDS:=+libpthread
 endef
 
 define Package/olsrd/conffiles
@@ -45,13 +47,13 @@ endef
 
 define Package/olsrd-mod-bmf
   $(call Package/olsrd/template)
-  DEPENDS:=olsrd +libpthread +kmod-tun
+  DEPENDS:=olsrd +kmod-tun
   TITLE:=Basic multicast forwarding plugin
 endef
 
 define Package/olsrd-mod-dyn-gw
   $(call Package/olsrd/template)
-  DEPENDS:=olsrd +libpthread
+  DEPENDS:=olsrd
   TITLE:=Dynamic internet gateway plugin
 endef
 
@@ -107,7 +109,7 @@ endef
 
 define Package/olsrd/install
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/olsr.config $(1)/etc/config/olsr
+	$(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cfgparser/olsrd.conf.example $(1)/etc/olsrd.conf
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/