X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Frrdcollect%2FMakefile;h=a2a90f1fdc2525308068a48f06fb34e226f094db;hb=3418368adf965242fce98416de2ed0d6bc18a1b2;hp=519d84d2c523058c929251a33e91cd9bc15df0f0;hpb=51fb4e32a0a1b74b8a708d4831f5459737cbf19e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile
index 519d84d2c5..a2a90f1fdc 100644
--- a/utils/rrdcollect/Makefile
+++ b/utils/rrdcollect/Makefile
@@ -11,46 +11,46 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=rrdcollect
 PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11
 
-PKG_SOURCE_URL:=@SF/rrdcollect
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/rrdcollect
+PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-ifneq ($(BR2_PACKAGE_LIBRRD),)
-RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
-endif
-
 include $(INCLUDE_DIR)/package.mk
 
-define Package/rrdcollect
+define Package/rrdcollect/Default
   SECTION:=utils
   CATEGORY:=Utilities
+  DESCRIPTION:=\
+	RRDcollect is a daemon which polls ceratin files in /proc/ \\\
+	directory, gathering data and storing it inside RRDtool's \\\
+	database files.  Being written in C should be both fast \\\
+	and resources-friendly.  Supports both scanf(3)-style \\\
+	pattern matches and perl compatible regular expressions.
+  URL:=http://rrdcollect.sourceforge.net/
+endef
+
+define Package/rrdcollect
+  $(call Package/rrdcollect/Default)
   DEPENDS:=+librrd1
   TITLE:=Round-Robin Database (RRD) collecting daemon
-  DESCRIPTION:=RRDcollect is a daemon which polls ceratin files in /proc/\\\
-	directory, gathering data and storing it inside RRDtool's\\\
-	database files.  Being written in C should be both fast\\\
-	and resources-friendly.  Supports both scanf(3)-style\\\
-	pattern matches and perl compatible regular expressions.\\\
-  URL:=http://rrdcollect.sourceforge.net/
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the RRD collecting daemon.
   MENU:=1
 endef
 
 define Package/rrdcollect-example
-  SECTION:=utils
-  CATEGORY:=Utilities
+  $(call Package/rrdcollect/Default)
   DEPENDS:=rrdcollect
   TITLE:=Example setup for RRD collecting daemon above
-  DESCRIPTION:=RRDcollect is a daemon which polls ceratin files in /proc/\\\
-        directory, gathering data and storing it inside RRDtool's\\\
-        database files.  Being written in C should be both fast\\\
-        and resources-friendly.  Supports both scanf(3)-style\\\
-        pattern matches and perl compatible regular expressions.\\\
-  URL:=http://rrdcollect.sourceforge.net/
+  DESCRIPTION+=\\\
+	\\\
+	This package contains examples for the RRD collecting daemon.
 endef
 
 define Package/rrdcollect-example/conffiles
@@ -63,42 +63,37 @@ define Build/Configure
 		--enable-shared \
 		--disable-static \
 		--disable-rpath \
-		--with-gnu-ld \
 		--enable-exec \
 		--without-rrdtool \
 		--with-librrd \
 		--without-libpcre \
-		--without-libpcap, \
+		--without-libpcap \
+		, \
 		CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		LIBS="$(RRDTOOL_LIBS) -lz" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		LIBS="-lz" \
 	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/rrdcollect/install	
-	install -d -m0755 $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/
 endef
 
 define Package/rrdcollect-example/install	
-	install -d -m0755 $(1)/etc
-	install -m0644 ./files/rrd.conf $(1)/etc/
-	install -m0644 ./files/rrdcollect.conf $(1)/etc/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 ./files/rrd.sh $(1)/usr/bin/
-	install -d -m0755 $(1)/www/cgi-bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/rrd.conf $(1)/etc/
+	$(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) ./files/rrd.sh $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/www/cgi-bin
 	ln -sf /var/lib/rrdcollect/rrd.cgi $(1)/www/cgi-bin/rrd.cgi
 	ln -sf /var/lib/rrdcollect/img $(1)/www/img
 endef