poco: moved to github

[packages.git] / utils / rrdtool / Makefile

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index caab4d6..74f063a 100644 (file)
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool
 PKG_VERSION:=1.2.30
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -21,10 +21,12 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_python-rrd \
        CONFIG_PACKAGE_rrdcgi \
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/rrdtool/Default
   SECTION:=utils
@@ -38,7 +40,7 @@ $(call Package/rrdtool/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= management library (v1.2.x)
-  DEPENDS+= +libart +libfreetype +libpng +zlib
+  DEPENDS+= +libart +libfreetype +libpng +zlib +libpthread
 endef
 
 define Package/rrdcgi
@@ -96,7 +98,7 @@ endif
 
 define Build/Compile
        $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+       $(call Build/Compile/Default)
 endef
 
 define Build/InstallDev
@@ -135,5 +137,5 @@ $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
 $(eval $(call BuildPackage,rrdtool))
 
-$(eval $(call PyPackage,python-rrd))
-$(eval $(call BuildPackage,python-rrd))
+#$(eval $(call PyPackage,python-rrd))
+#$(eval $(call BuildPackage,python-rrd))