From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 24 Dec 2009 03:19:28 +0000 (+0000)
Subject: rrdtool: move dev headers & libraries out the way, so that they don't interfere with... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17d9b54004c4255b03e74657d57905cb01dae300;p=openwrt%2Fsvn-archive%2Fpackages.git

rrdtool: move dev headers & libraries out the way, so that they don't interfere with rrdtool-1.0.x (fix wrong detection in collectd)

SVN-Revision: 18912
---

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index f658e32d5..caab4d675 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -100,11 +100,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
+	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/
 endef
 
 define Package/librrd/install