From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 23 Apr 2009 14:55:11 +0000 (+0000)
Subject: madwifi: fix a header file conflict with iptables
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=6c1b68bb5434cf884682b45af3ae88b3ce55026e

madwifi: fix a header file conflict with iptables

SVN-Revision: 15354
---

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 433cb61e15..cfa9f44f49 100644
--- 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 69c4507670..bbc2b88c94 100644
--- 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