diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-08 22:01:19 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-08 22:01:19 +0000 |
| commit | db251d137778d90fc9e9b4779c453735d29a72de (patch) | |
| tree | 832d2a63a4346d4a01d0689c2c4388fe42953d8f /package/rrdcollect/Makefile | |
| parent | 80f16c3afcb0444c61f52b155665a20c4a48f16d (diff) | |
add rrdtool1 (v1.0.x) and enable it by default,
disable rrdtool (v1.2.x),
change Maintainer in control files,
tweak Makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1881 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/rrdcollect/Makefile')
| -rw-r--r-- | package/rrdcollect/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 94dea16a3..b3be69a98 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -14,6 +14,10 @@ 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 $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) @@ -23,9 +27,9 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ - LIBS="-lart_lgpl_2 -lfreetype -lpng -lz" \ + 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" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ @@ -48,6 +52,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(DISABLE_LARGEFILE) \ --enable-shared \ --disable-static \ + --disable-rpath \ + --with-gnu-ld \ --enable-exec \ --without-rrdtool \ --with-librrd \ |