X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8f4b79da58ea9faa336db9111a50ca484f1ed76f..0a69209c2bd9fbc893609965a7b5a3db9d0794e4:/package/olsrd/Makefile

diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 0060fd9c7..a5092c875 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.4.9
+PKG_VERSION:=0.4.10
 PKG_RELEASE:=1
-PKG_MD5SUM:=593c0861fa10d2a8d0e7d8617479c5cf
+PKG_MD5SUM:=9807d4451e65cb4ec385155eef7bf3cf
 
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -33,6 +33,7 @@ $(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,$(PKG_VERSION)-
 $(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OLSRD_MOD_POWER,olsrd-mod-power,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OLSRD_MOD_SECURE,olsrd-mod-secure,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_mod_template,OLSRD_MOD_DOT_DRAW,dot_draw))
 $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw))
@@ -40,31 +41,31 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo))
 $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice))
 $(eval $(call PKG_mod_template,OLSRD_MOD_POWER,power))
 $(eval $(call PKG_mod_template,OLSRD_MOD_SECURE,secure))
+$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
 
 $(PKG_BUILD_DIR)/.configured:
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		$(TARGET_CONFIGURE_OPTS) \
+		NODEBUG=1 \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		OS="linux" \
-		all libs
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		OS="linux" \
-		install install_libs
-	touch $(PKG_BUILD_DIR)/.built
+		STRIP="/bin/true" \
+		all libs install install_libs
+	touch $@
 
 $(IPKG_OLSRD):
 	install -d -m0755 $(IDIR_OLSRD)/etc
-	cp -fpR $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/
+	$(CP) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/
 	install -d -m0755 $(IDIR_OLSRD)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/
 	install -d -m0755 $(IDIR_OLSRD)/etc/init.d
-	cp -fpR ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/olsrd
+	install -m0755 ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/S60olsrd
 	$(RSTRIP) $(IDIR_OLSRD)
 	$(IPKG_BUILD) $(IDIR_OLSRD) $(PACKAGE_DIR)
 
@@ -72,4 +73,4 @@ $(IPKG_OLSRD_MOD_SECURE): $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key
 
 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key:
 	install -d -m0755 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d
-	cp -fpR ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/
+	$(CP) ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/