diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep
index 0e93e1ed9..123b71da2 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.bep
+++ b/dev-libs/libiconv/libiconv-1.13.1.bep
@@ -11,26 +11,26 @@ BUILD {
 	ln -sf /boot/common/bin/autoconf /boot/common/bin/autoconf-2.63
 	ln -sf /boot/common/bin/autoheader /boot/common/bin/autoheader-2.63 
 	ln -sf /boot/common/bin/aclocal /boot/common/bin/aclocal-1.11 
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/libtool.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltoptions.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltversion.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltsugar.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/lt~obsolete.m4 m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
-	cp -r /boot/common/share/libtool m4
+	cp -r `finddir B_COMMON_DATA_DIRECTORY`/libtool m4
 	libtoolize --force --copy --install 
 	aclocal -I m4 -I srcm4
 	autoconf
 	autoheader
 	cd libcharset
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/libtool.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltoptions.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltversion.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/ltsugar.m4 m4
+	cp `finddir B_COMMON_DATA_DIRECTORY`/aclocal/lt~obsolete.m4 m4
        echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
 	libtoolize --force --copy --install
-	cp -r /boot/common/share/libtool m4
+	cp -r `finddir B_COMMON_DATA_DIRECTORY`/libtool m4
 	libtoolize --force --copy --install
 	aclocal -I m4 
 	autoconf