@@ -195,11 +195,13 @@
 
 		echo "using gcc : pnacl : ${CXX} ;" >> project-config.jam
 
 		./b2 --debug-configuration toolset=gcc-pnacl target-os=linux link=static runtime-link=static || exit 1
 
-		./bjam install || exit 1
+		./bjam install | grep -v '^common.copy '
+
+		exit 0
 	) || return 1
 
 	rm -rf "${workdir}"
 
 	return 0
@@ -304,11 +306,11 @@
 	(
 		cd ../.. || exit 1
 
 		make distclean
 
-		./configure --host=nacl --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay || exit 1
+		./configure --host=nacl --with-pcsc-headers="${instdir}/include/PCSC" --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay || exit 1
 		make || exit 1
 	) || return 1
 
 	mkdir -p "${instdir}/lib"
 	cp ../../libcackey.a ../../libcackey_g.a "${instdir}/lib" || return 1