madwifi: fix a header file conflict with iptables

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15354 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 433cb61..cfa9f44 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -176,7 +176,7 @@ MADWIFI_INC = \
        -I$(PKG_BUILD_DIR)/ath \
        -I$(PKG_BUILD_DIR)/ath_hal \
        -I$(PKG_BUILD_DIR)/net80211 \
-       -I$(STAGING_DIR)/usr/include \
+       -I$(STAGING_DIR)/usr/include/wprobe \
        -include $(PKG_BUILD_DIR)/include/compat.h
 
 MAKE_ARGS:= \

diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 69c4507..bbc2b88 100644 (file)
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -103,8 +103,8 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include/wprobe
+       $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include/wprobe
 endef
 
 define Package/wprobe-info/install