[tools] fix segfault when using the maxlen argument (#4359)

[openwrt.git] / package / wprobe / Makefile

diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 7b49b65..a28ad93 100644 (file)
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -45,7 +45,7 @@ endef
 define Package/wprobe-export
   SECTION:=net
   CATEGORY:=Network
 define Package/wprobe-export
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+kmod-wprobe +libnl-tiny
+  DEPENDS:=+wprobe-info

   TITLE:=Wireless measurement data exporter
 endef
 
   TITLE:=Wireless measurement data exporter
 endef
 


@@ -59,9 +59,9 @@ define Build/Prepare
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) src/* $(PKG_BUILD_DIR)/
 endef
 

-TARGET_CFLAGS += \
+TARGET_CPPFLAGS := \

        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \

-       -I$(STAGING_DIR)/usr/include
+       $(TARGET_CPPFLAGS)

 
 ifdef CONFIG_PACKAGE_kmod-wprobe
   define Build/Compile/kmod
 
 ifdef CONFIG_PACKAGE_kmod-wprobe
   define Build/Compile/kmod


@@ -113,8 +113,9 @@ define Package/wprobe-info/install
 endef
 
 define Package/wprobe-export/install
 endef
 
 define Package/wprobe-export/install

-       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config

        $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/
        $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/

+       $(INSTALL_BIN) ./files/wprobe.config $(1)/etc/config/wprobe

        $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/
 endef
 
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/
 endef