diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:32:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:32:55 +0100 |
| commit | 3d45df344602687c8983f5fb609721aa8ca2469f (patch) | |
| tree | bd089044e1402b116cf6447eda74e81b7f65d129 /package/collectd | |
| parent | 897be7157eb98898fdc62224857025d4a0f01dd5 (diff) | |
rework PKG_FLAVOURS. Subpackages can have flavours, so
always add PKG_NAME to PKG_FLAVOURS variable.
ala PKG_FLAVOURS_LIBNCURSES.
Bug reported by Phil Sutter.
Diffstat (limited to 'package/collectd')
| -rw-r--r-- | package/collectd/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 52e6e6ab5..277e061cf 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -13,26 +13,26 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ -PKG_FLAVOURS:= CPU LOAD MEMORY PING -PKGFD_CPU:= collect CPU statistics -PKGFD_LOAD:= collect system load statistics -PKGFD_MEMORY:= collect memory usage statistics -PKGFD_PING:= enable ping statistic plugin +PKG_FLAVOURS_COLLECD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING +PKGFD_WITH_CPU:= collect CPU statistics +PKGFD_WITH_LOAD:= collect system load statistics +PKGFD_WITH_MEMORY:= collect memory usage statistics +PKGFD_WITH_PING:= enable ping statistic plugin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifneq (${ADK_PACKAGE_COLLECTD_CPU},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y) DISABLE_CPU:=--disable-cpu endif -ifneq (${ADK_PACKAGE_COLLECTD_LOAD},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_LOAD},y) DISABLE_LOAD:=--disable-load endif -ifneq (${ADK_PACKAGE_COLLECTD_MEMORY},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_MEMORY},y) DISABLE_MEMORY:=--disable-memory endif -ifneq (${ADK_PACKAGE_COLLECTD_PING},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y) DISABLE_PING:=--disable-ping endif |