X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ef0a8980a26b3eb90b98645083dfc7c65b7e881f..6552fe0ce941c33504d87534ca60c6f0df211a37:/package/swconfig/Makefile?ds=sidebyside

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 5959ef4c8..a7bed7317 100644
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -1,29 +1,31 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=kmod-swconfig
-PKG_RELEASE:=1
-PKG_BUILD_DEPENDS:=libnl
+PKG_NAME:=swconfig
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@LINUX_2_6_26||LINUX_2_6_27||LINUX_2_6_28||LINUX_2_6_29 +libuci
+  DEPENDS:=@LINUX_2_6 +libuci +libnl-tiny
   TITLE:=Switch configuration utility
 endef
 
-TARGET_CPPFLAGS += \
+TARGET_CPPFLAGS := \
+	-D_GNU_SOURCE \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
 	-I$(LINUX_DIR)/include \
-	-I$(PKG_BUILD_DIR)
+	-I$(PKG_BUILD_DIR) \
+	$(TARGET_CPPFLAGS)
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
@@ -31,15 +33,15 @@ define Build/Prepare
 endef
 
 define Build/Compile
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		LIBS="-L$(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/lib/libnl.a -lm -luci"
+		LIBS="$(TARGET_LDFLAGS) -lnl-tiny -lm -luci"
 endef
 
 define Package/swconfig/install
-	$(INSTALL_DIR) $(1)/bin $(1)/lib/network
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/bin/swconfig
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib/network
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/sbin/swconfig
 	$(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/
 endef