Changeset 30126

Timestamp:

2012-02-04T21:38:22+01:00 (6 years ago)

Author:

jow

Message:

[packages_10.03.2] vnstat: merge r29229

Location:

branches/packages_10.03.2/net/vnstat

Files:

• Makefile (modified) (3 diffs)
• files/vnstat-uci.conf (deleted)
• files/vnstat.config (copied) (copied from packages/net/vnstat/files/vnstat.config)

branches/packages_10.03.2/net/vnstat/Makefile

@@ -10 +10 @@
 PKG_NAME:=vnstat
 PKG_VERSION:=1.11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -81 +81 @@
 define Package/vnstat/install
         $(INSTALL_DIR) $(1)/usr/bin
-        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vnstat $(1)/usr/bin/
+        $(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstat $(1)/usr/bin/
         $(INSTALL_DIR) $(1)/usr/sbin
-        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
+        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/etc
         $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vnstat.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/etc/config
-        $(INSTALL_CONF) ./files/vnstat-uci.conf $(1)/etc/config/vnstat
+        $(INSTALL_CONF) ./files/vnstat.config $(1)/etc/config/vnstat
         $(INSTALL_DIR) $(1)/etc/init.d
         $(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat
@@ -96 +96 @@
 define Package/vnstati/install
         $(INSTALL_DIR) $(1)/usr/bin
-        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vnstati $(1)/usr/bin/
+        $(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstati $(1)/usr/bin/
 endef