move arpwatch arp.dat to /etc/arpwatch/ and add it to conffiles

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

diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index 023ed68..35a3280 100644 (file)
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -45,16 +45,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
        touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
+       $(MAKE) CC=$(TARGET_CC) ARPDIR=/etc/arpwatch -C $(PKG_BUILD_DIR)
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       cp arpwatch.conffiles $(PKG_IPK_DIR)/CONTROL/conffiles
        mkdir -p $(PKG_IPK_DIR)/usr/sbin
        cp $(PKG_BUILD_DIR)/arpwatch $(PKG_IPK_DIR)/usr/sbin/
        cp $(PKG_BUILD_DIR)/arpsnmp $(PKG_IPK_DIR)/usr/sbin/
        $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-       mkdir $(PKG_IPK_DIR)/usr/arpwatch
-       cp $(PKG_BUILD_DIR)/arp.dat $(PKG_IPK_DIR)/usr/arpwatch/
+       mkdir -p $(PKG_IPK_DIR)/etc/arpwatch
+       cp $(PKG_BUILD_DIR)/arp.dat $(PKG_IPK_DIR)/etc/arpwatch/
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 

diff --git a/package/arpwatch/arpwatch.conffiles b/package/arpwatch/arpwatch.conffiles
new file mode 100644 (file)
index 0000000..9b9d8b3
--- /dev/null
+++ b/package/arpwatch/arpwatch.conffiles
@@ -0,0 +1 @@
+/etc/arpwatch/arp.dat