[packages] pv: update to 1.2.0, use PKG_INSTALL

[openwrt/svn-archive/archive.git] / utils / sysstat / Makefile

diff --git a/utils/sysstat/Makefile b/utils/sysstat/Makefile
index bb484f28f6bd89b6360e84d556b01c12612c2790..4be0bb121794ee25dee558e51a2d9d84cbf5d454 100644 (file)
--- a/utils/sysstat/Makefile
+++ b/utils/sysstat/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 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.
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sysstat
-PKG_VERSION:=9.0.4
+PKG_VERSION:=9.0.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard
-PKG_MD5SUM:=4ecde27986c3745a363a95e34cf897c8
+PKG_MD5SUM:=e069daf192d259de905d7f8cdd85dc4e
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,21 +36,21 @@ define Package/sysstat/conffiles
 /etc/sysstat/config
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               sa_lib_dir="/usr/lib/sysstat" \
-               sa_dir="/var/log/sysstat" \
-               conf_dir="/etc/sysstat" \
-       )
-endef
+CONFIGURE_VARS+= \
+       sa_lib_dir="/usr/lib/sysstat" \
+       sa_dir="/var/log/sysstat" \
+       conf_dir="/etc/sysstat" \
+
+CONFIGURE_ARGS+= \
+       --disable-documentation \
 
 define Package/sysstat/install
        $(INSTALL_DIR) $(1)/usr/lib/sysstat
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/{sadc,sa1,sa2} $(1)/usr/lib/sysstat
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sysstat/{sadc,sa1,sa2} $(1)/usr/lib/sysstat/
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/{sar,sadf,iostat,mpstat,pidstat} $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sar,sadf,iostat,mpstat,pidstat} $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/sysstat
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/sysstat.ioconf $(1)/etc/sysstat
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sysstat/sysstat.ioconf $(1)/etc/sysstat/
        $(INSTALL_CONF) ./files/config $(1)/etc/sysstat/config
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/sysstat.init $(1)/etc/init.d/sysstat