From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 14 Apr 2008 01:10:08 +0000 (+0000)
Subject: rename rrdpy to python-rrd, move it to Python submenu
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=7272e9515810dce9d6f9a7748f171f382460e940;p=packages.git

rename rrdpy to python-rrd, move it to Python submenu


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

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index f84f3012b..475f9a413 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -51,9 +51,13 @@ $(call Package/rrdtool/Default)
   DEPENDS+= +librrd
 endef
 
-define Package/rrdpy
-  TITLE:=Round Robin Database (RRD) python bindings (v1.2.x)
-  DEPENDS+= +librrd
+define Package/python-rrd
+$(call Package/rrdtool/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE+= python bindings (v1.2.x)
+  DEPENDS+= python-core +librrd
 endef
 
 CONFIGURE_ARGS += \
@@ -80,7 +84,7 @@ else
   CONFIGURE_ARGS += --disable-rrdcgi
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_rrdpy),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_python-rrd),)
   CONFIGURE_ARGS += \
 	--enable-python
   CONFIGURE_VARS += \
@@ -115,19 +119,20 @@ define Package/rrdcgi/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
 endef
 
-define PyPackage/rrdpy/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
-endef
-
 define Package/rrdtool/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
 endef
 
+define PyPackage/python-rrd/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
+endef
+
 $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
-$(eval $(call PyPackage,rrdpy))
-$(eval $(call BuildPackage,rrdpy))
 $(eval $(call BuildPackage,rrdtool))
+
+$(eval $(call PyPackage,python-rrd))
+$(eval $(call BuildPackage,python-rrd))