diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.bep
index 4d31003a8..faed53582 100644
--- a/dev-libs/fribidi/fribidi-0.19.2.bep
+++ b/dev-libs/fribidi/fribidi-0.19.2.bep
@@ -18,7 +18,15 @@ BUILD {
 	aclocal -I m4
 	automake
 	autoconf
-	./configure --prefix=/boot/common
+	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	if [ -n "$(setgcc | grep '2')" ]; then 
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	else
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
+	fi
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--libdir=$LIBDIR \
+		--mandir=$MANDIR
 	make
 }
 
diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep
index c1f613bd6..3072dcdea 100644
--- a/media-libs/flac/flac-1.2.1.bep
+++ b/media-libs/flac/flac-1.2.1.bep
@@ -8,8 +8,17 @@ DEPEND="gettext >= 0.17"
 BUILD {
 	cd flac-1.2.1
 	libtoolize --force --copy --install
-	./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY`
+	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	if [ -n "$(setgcc | grep '2')" ]; then 
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	else
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
+	fi
+	./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \
+		--libdir=$LIBDIR \
+		--mandir=$MANDIR
 	make
+
 }
 
 INSTALL {