From: acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 13 Aug 2009 10:37:14 +0000 (+0000)
Subject: [packages] kismet: Update configuration and remove deprecated files (#5676)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=6941f0d45ec1d36b1479b4eff8f845f2467d704b;p=packages.git

[packages] kismet: Update configuration and remove deprecated files (#5676)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17241 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 1d32e5cc3..996c244c4 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -40,10 +40,7 @@ $(call Package/kismet/Default)
 endef
 
 define Package/kismet-client/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
 /etc/kismet/kismet.conf
-/etc/kismet/kismet_ui.conf
 endef
 
 define Package/kismet-client/description
@@ -73,8 +70,6 @@ $(call Package/kismet/Default)
 endef
 
 define Package/kismet-server/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
 /etc/kismet/kismet.conf
 endef
 
@@ -107,26 +102,21 @@ endef
 
 define Package/kismet-client/install
 	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/kismet_ui.conf $(1)/etc/kismet/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
 endef
 
 define Package/kismet-drone/install
 	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/kismet_drone.conf $(1)/etc/kismet/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet_drone.conf $(1)/etc/kismet/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
 endef
 
 define Package/kismet-server/install
 	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
-	$(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
 endef