--- embedaddon/build.sh	2011/11/01 21:38:11	1.5.2.3
+++ embedaddon/build.sh	2011/11/02 01:04:13	1.5.2.4
@@ -4,7 +4,7 @@
 #
 # ./build.sh [package] [os_specific_build_set] [prefix_dir] [other_make_opts ...]
 #
-# $Id: build.sh,v 1.5.2.3 2011/11/01 21:38:11 misho Exp $
+# $Id: build.sh,v 1.5.2.4 2011/11/02 01:04:13 misho Exp $
 #
 
 CMD=$1
@@ -408,10 +408,11 @@ case $CMD in
 		./configure --enable-utf8 --enable-unicode-properties ${PFX}
 		${MK} clean
 		${MK}
-		install .libs/libpcre.so.* ${P}/lib
-		install .libs/libpcreposix.so.* ${P}/lib
-		install .libs/libpcrecpp.so.* ${P}/lib
-		rm -f ${P}/lib/libpcrecpp.so*T ${P}/lib/libpcreposix.so*T
+		${MK} install
+#		install .libs/libpcre.so.* ${P}/lib
+#		install .libs/libpcreposix.so.* ${P}/lib
+#		install .libs/libpcrecpp.so.* ${P}/lib
+#		rm -f ${P}/lib/libpcrecpp.so*T ${P}/lib/libpcreposix.so*T
 		echo ">>> Now rebuild elwix firmware image ..."
 		;;
 	spawn-fcgi)
@@ -438,12 +439,14 @@ case $CMD in
 		./configure --without-python ${PFX}
 		${MK} clean
 		${MK}
-		install .libs/libxml2.so.* ${P}/lib
+		${MK} install
+#		install xml2-config ${P}/bin
+#		install .libs/libxml2.so.* ${P}/lib
 		cd ..
 		cd php
 #		[ ! -r config.log ] && \
 		./configure --localstatedir=/var --with-config-file-scan-dir=/etc/php --disable-all \
-			--enable-libxml=../libxml2/.libs --with-openssl \
+			--enable-xml --enable-libxml --with-libxml-dir=${P} --with-openssl \
 			--enable-zip --enable-sqlite-utf8 ${PFX}
 		${MK} clean
 		${MK}