revert last change

[openwrt/svn-archive/archive.git] / net / olsrd / Makefile

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index e4e3c63a62e21212200e20610fe14806d42cb2d5..c3d4446a20d1cc834c0307a622239dd082bd4891 100644 (file)
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -9,15 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.5.4
+PKG_VERSION:=0.5.6-r2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+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:=471d0d268fae388d18f925ea9dfe0150
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=64b439cde30f48764f02cdd8766aba40
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -32,6 +30,7 @@ endef
 define Package/olsrd
   $(call Package/olsrd/template)
   MENU:=1
+  DEPENDS:=+libpthread
 endef
 
 define Package/olsrd/conffiles
@@ -46,13 +45,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
 
@@ -108,7 +107,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/