[backfire] merge r21477

[openwrt-10.03/.git] / package / swconfig / Makefile

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index dbc38ec34377b90fecc9076b191a88514f01bc98..b0a72ceeb70e3a378707932a5662d9d2658aef45 100644 (file)
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swconfig
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@LINUX_2_6 +libuci +libnl-tiny
+  DEPENDS:=@LINUX_2_6 @!TARGET_brcm47xx +libuci +libnl-tiny
   TITLE:=Switch configuration utility
 endef
 
@@ -24,6 +24,7 @@ TARGET_CPPFLAGS := \
        -D_GNU_SOURCE \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        -I$(LINUX_DIR)/include \
+       -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
        -I$(PKG_BUILD_DIR) \
        $(TARGET_CPPFLAGS)