diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.bep
index f6aa49a2f..b074e1bc5 100644
--- a/dev-libs/libpcre/libpcre-8.12.bep
+++ b/dev-libs/libpcre/libpcre-8.12.bep
@@ -7,24 +7,35 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd pcre-8.12
-	if [ -n "$(setgcc | grep '2')" ]; then
+#	if [ -n "$(setgcc | grep '2')" ]; then
     	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-    else
-    	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
-    fi
+#   else
+#    	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
+#   fi
 	libtoolize --force --copy
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=/boot/common --enable-utf8 --enable-unicode-properties --with-pic --libdir=${LIBDIR}
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--enable-utf8 \
+		--enable-unicode-properties \
+		--with-pic \
+		--libdir=${LIBDIR} \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+		--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc
 	make
-	make check
 }
 
 INSTALL {
 	cd pcre-8.12
 	make install
 }
+
+TEST {
+	cd pcre-8.12
+	make check
+}
+
 LICENSE="PCRE"
 COPYRIGHT="1997-2010 University of Cambridge
 	2007-2010, Google Inc. All rights reserved."