[package] ppp: use service_kill()

[openwrt.git] / package / swconfig / Makefile

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index d22fa62..24ebaee 100644 (file)
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 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.
 #
 # 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
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swconfig

-PKG_RELEASE:=1
+PKG_RELEASE:=6

 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -16,13 +16,15 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system

-  DEPENDS:=@LINUX_2_6 +libuci +libnl-tiny
+  DEPENDS:=@!TARGET_brcm47xx +libuci +libnl-tiny

   TITLE:=Switch configuration utility
 endef
 
 TARGET_CPPFLAGS := \
   TITLE:=Switch configuration utility
 endef
 
 TARGET_CPPFLAGS := \

+       -D_GNU_SOURCE \

        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        -I$(LINUX_DIR)/include \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \
        -I$(LINUX_DIR)/include \

+       -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \

        -I$(PKG_BUILD_DIR) \
        $(TARGET_CPPFLAGS)
 
        -I$(PKG_BUILD_DIR) \
        $(TARGET_CPPFLAGS)
 


@@ -39,8 +41,8 @@ define Build/Compile
 endef
 
 define Package/swconfig/install
 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
 
        $(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/
 endef