fix #81

[openwrt.git] / openwrt / package / olsrd / Makefile

diff --git a/openwrt/package/olsrd/Makefile b/openwrt/package/olsrd/Makefile
index 0060fd9..2198136 100644 (file)
--- a/openwrt/package/olsrd/Makefile
+++ b/openwrt/package/olsrd/Makefile
@@ -42,21 +42,20 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_POWER,power))
 $(eval $(call PKG_mod_template,OLSRD_MOD_SECURE,secure))
 
 $(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
@@ -64,7 +63,7 @@ $(IPKG_OLSRD):
        install -d -m0755 $(IDIR_OLSRD)/usr/sbin
        cp -fpR $(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
+       cp -fpR ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/S60olsrd
        $(RSTRIP) $(IDIR_OLSRD)
        $(IPKG_BUILD) $(IDIR_OLSRD) $(PACKAGE_DIR)