X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bca2557f1968c426190b72e040bce65ce16c9884..6ceb7617a76b7dbe0fd23a63aeb6bdac4e37ee88:/openwrt/package/rrdcollect/Makefile

diff --git a/openwrt/package/rrdcollect/Makefile b/openwrt/package/rrdcollect/Makefile
index 94dea16a3..cc2e19ac4 100644
--- a/openwrt/package/rrdcollect/Makefile
+++ b/openwrt/package/rrdcollect/Makefile
@@ -14,18 +14,22 @@ 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)))
 $(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(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 \