diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/rrdcollect/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/rrdcollect/Makefile')
| -rw-r--r-- | package/rrdcollect/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 49ca85db6..ee6228092 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -9,7 +9,10 @@ PKG_NAME:= rrdcollect PKG_VERSION:= 0.2.3 PKG_RELEASE:= 8 PKG_MD5SUM:= 5e4305c612bc3cccbaf802c275c81a11 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/} +PKG_DESCR:= Round-Robin Database (RRD) collecting daemon +PKG_SECTION:= admin +PKG_DEPENDS:= librrd +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/} ifneq (${ADK_PACKAGE_LIBRRD},) RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng @@ -17,8 +20,8 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= LIBS="${RRDTOOL_LIBS} -lz" ac_cv_func_malloc_0_nonnull=yes @@ -37,9 +40,6 @@ post-install: ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc ${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \ ${IDIR_RRDCOLLECT_EXAMPLE}/etc/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc/init.d - ${INSTALL_BIN} ./files/rrdcollect.init \ - ${IDIR_RRDCOLLECT_EXAMPLE}/etc/init.d/${PKG_NAME} ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin ${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/ ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin |