fix segfault and set right dependency

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

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index d9b9c8c4f1e785a826f687ea8ca3b1d4452b44cd..3c7581b71e612b4914e465f2d1c0b3df8cb3747c 100644 (file)
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.4.10
+PKG_VERSION:=0.5.2
 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.4
-PKG_MD5SUM:=9807d4451e65cb4ec385155eef7bf3cf
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=a61029e11c001be2997c1e088576d0f5
 PKG_CAT:=bzcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -41,9 +41,16 @@ define Package/olsrd-mod-dot-draw
   MENU:=0
 endef
 
+define Package/olsrd-mod-bmf
+  $(call Package/olsrd)
+  DEPENDS:=olsrd +libpthread +kmod-tun
+  TITLE:=Basic multicast forwarding plugin
+  MENU:=0
+endef
+
 define Package/olsrd-mod-dyn-gw
   $(call Package/olsrd)
-  DEPENDS:=olsrd
+  DEPENDS:=olsrd +libpthread
   TITLE:=Dynamic internet gateway plugin
   MENU:=0
 endef
@@ -62,13 +69,6 @@ define Package/olsrd-mod-nameservice
   MENU:=0
 endef
 
-define Package/olsrd-mod-power
-  $(call Package/olsrd)
-  DEPENDS:=olsrd
-  TITLE:=Power status plugin
-  MENU:=0
-endef
-
 define Package/olsrd-mod-secure
   $(call Package/olsrd)
   DEPENDS:=olsrd
@@ -99,62 +99,66 @@ define Build/Compile
                OFLAGS="$(TARGET_CFLAGS)" \
                OS="linux" \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+               LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \
+               SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin/" \
+               ETCDIR="$(PKG_INSTALL_DIR)/etc" \
+               MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
                STRIP="/bin/true" \
                all libs install install_libs
 endef
 
 define Package/olsrd/install
-       install -d -m0755 $(1)/etc
+       $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(1)/etc/
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/olsrd.init $(1)/etc/init.d/S60olsrd
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
 endef
 
 define Package/olsrd-mod-dot-draw/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/
+endef
+
+define Package/olsrd-mod-bmf/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_bmf.so.* $(1)/usr/lib/
 endef
 
 define Package/olsrd-mod-dyn-gw/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/
 endef
 
 define Package/olsrd-mod-httpinfo/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/
 endef
 
 define Package/olsrd-mod-nameservice/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/
-endef
-
-define Package/olsrd-mod-power/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_power.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/
 endef
 
 define Package/olsrd-mod-secure/install
-       install -d -m0755 $(1)/etc/olsrd.d
+       $(INSTALL_DIR) $(1)/etc/olsrd.d
        $(CP) ./files/olsrd_secure_key $(1)/etc/olsrd.d/
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/
 endef
 
 define Package/olsrd-mod-tas/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/
 endef
 
 
 $(eval $(call BuildPackage,olsrd))
 $(eval $(call BuildPackage,olsrd-mod-dot-draw))
+$(eval $(call BuildPackage,olsrd-mod-bmf))
 $(eval $(call BuildPackage,olsrd-mod-dyn-gw))
 $(eval $(call BuildPackage,olsrd-mod-httpinfo))
 $(eval $(call BuildPackage,olsrd-mod-nameservice))
-$(eval $(call BuildPackage,olsrd-mod-power))
 $(eval $(call BuildPackage,olsrd-mod-secure))
 $(eval $(call BuildPackage,olsrd-mod-tas))