summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-23 14:55:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-23 14:55:11 +0000
commit51a182a864efe986da327fc07a1e4a12dadd8ed3 (patch)
tree0e95cb0d6444919d3830d01e6c1131924cfbbfa1
parent4fdf829b304fa33c6455b49b505e667643e7ee70 (diff)
madwifi: fix a header file conflict with iptables
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15354 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/madwifi/Makefile2
-rw-r--r--package/wprobe/Makefile4
2 files changed, 3 insertions, 3 deletions
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