From e3836ca8c8f9d999a7e6b7cafa1bb7404e59f2e2 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 6 May 2011 19:36:01 +0000
Subject: [PATCH] Cleaned up directories for flac.

---
 media-libs/flac/flac-1.2.1.bep | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep
index eb025bfe7..1a5b26f0a 100644
--- a/media-libs/flac/flac-1.2.1.bep
+++ b/media-libs/flac/flac-1.2.1.bep
@@ -10,21 +10,25 @@ BUILD {
 	haikuporter -b libiconv-1.13.1
 	cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4
 	libtoolize --force --copy --install
-	sed -i 's/$(datadir)\/doc\/$(PACKAGE)-$(VERSION)/@docdir@/g' doc/M*
 	aclocal -I m4
-	./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/flac \
+	autoconf
+	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC/M*
+	sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC++/M*
+	automake
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datarootdir=$COMMON_DOCS \
+		--docdir=$COMMON_DOCS/doc/flac \
 		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+		--mandir=$COMMON_DOCS/man
 	make
-
 }
 
 INSTALL {
 	cd flac-1.2.1
 	make install
 }
+
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
 	BSD (3-clause)"