From 1262eedb443f180a8c99fb879259f6981c47e0ed Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Tue, 26 Apr 2011 20:55:04 +0000
Subject: [PATCH] Cleaned up directories for graphviz.

---
 media-gfx/graphviz/graphviz-2.24.bep   | 15 ++++++++-------
 media-gfx/graphviz/graphviz-2.26.3.bep |  8 ++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/media-gfx/graphviz/graphviz-2.24.bep b/media-gfx/graphviz/graphviz-2.24.bep
index 060a51ab8..2285c4260 100644
--- a/media-gfx/graphviz/graphviz-2.24.bep
+++ b/media-gfx/graphviz/graphviz-2.24.bep
@@ -7,14 +7,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd graphviz-2.24.0
-	cp /boot/common/share/libtool/config/config.guess config
-	cp /boot/common/share/libtool/config/config.guess lib/gd/config
-	cp /boot/common/share/libtool/config/config.guess libltdl
-	cp /boot/common/share/libtool/config/config.sub config
-	cp /boot/common/share/libtool/config/config.sub lib/gd/config
-	cp /boot/common/share/libtool/config/config.sub libltdl
+	libtoolize -fci
+	aclocal -I m4
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-shared --enable-static CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv"
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--disable-shared \
+		--enable-static \
+		CFLAGS="-O0" \
+		LDFLAGS="-L`finddir B_COMMON_LIB_DIRECTORY` -liconv"
 	make
 }
 
@@ -24,5 +24,6 @@ INSTALL {
 	cd `finddir B_COMMON_BIN_DIRECTORY`
 	ln -s dot_static dot
 }
+
 LICENSE="CPL v1.0"
 COPYRIGHT="1994-2010 AT&T Corp."
diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.bep
index 9d0aed05e..702281e4d 100644
--- a/media-gfx/graphviz/graphviz-2.26.3.bep
+++ b/media-gfx/graphviz/graphviz-2.26.3.bep
@@ -7,9 +7,13 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd graphviz-2.26.3
-	libtoolize --force --copy --install
+	libtoolize -fci
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared --disable-perl 
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+		--enable-shared \
+		--disable-perl 
 	make
 }