--- embedaddon/build.sh	2011/07/22 10:45:28	1.4
+++ embedaddon/build.sh	2012/01/31 12:41:54	1.5.2.5
@@ -1,19 +1,24 @@
 #!/bin/sh
 #
-# (C)`10 PKG-Builder for elwix by Michael Pounov <misho@elwix.org>
+# (C)`10 PKG-Builder for ELWIX by Michael Pounov <misho@elwix.org>
 #
-# ./build.sh [package] [prefix_dir] [os_specific_set] [other_make_opts ...]
+# ./build.sh [package] [os_specific_build_set] [prefix_dir] [other_make_opts ...]
 #
-# $Id: build.sh,v 1.4 2011/07/22 10:45:28 misho Exp $
+# $Id: build.sh,v 1.5.2.5 2012/01/31 12:41:54 misho Exp $
 #
 
 CMD=$1
 MK=${2:-make}
 P=${3:-/tmp}
+B=$4
 PFX="--prefix ${P}"
-shift; shift; shift;
+shift; shift; shift; shift;
 echo ">>> Working script ${MK} into ${PFX}"
 
+if [ -n "${B}" ]; then
+	PFX="${PFX} --build ${B}"
+fi
+
 TOP=$(pwd)
 echo ">>> TOPDIR=${TOP}"
 
@@ -21,12 +26,18 @@ case $CMD in
 	sudo)
 		cd sudo
 #		[ ! -r config.log ] && \
-		./configure --sysconfdir=/etc --with-ignore-dot --with-tty-tickets \
-					 --with-env-editor --with-logincap \
-					 --with-long-otp-prompt --with-pam --with-logfac=local2 ${PFX}
+		./configure --sysconfdir=/etc --libexecdir=/usr/libexec --with-ignore-dot \
+					--with-tty-tickets --with-env-editor --with-logincap \
+					--with-long-otp-prompt --with-pam --with-logfac=local2 \
+					${PFX}
 		${MK} clean
 		${MK}
-		${MK} install
+		install src/sudo ${P}/bin
+		ln ${P}/bin/sudo ${P}/bin/sudoedit
+		install plugins/sudoers/sudoreplay ${P}/bin
+		install plugins/sudoers/visudo ${P}/sbin
+		install plugins/sudoers/.libs/sudoers.so ${P}/libexec
+		install src/.libs/libsudo_noexec.so ${P}/libexec
 		echo ">>> Now rebuild elwix firmware image ..."
 		;;
 	ntpd)
@@ -398,6 +409,10 @@ case $CMD in
 		${MK} clean
 		${MK}
 		${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)
@@ -425,11 +440,13 @@ case $CMD in
 		${MK} clean
 		${MK}
 		${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}
@@ -477,6 +494,15 @@ case $CMD in
 		${MK} clean
 		${MK}
 		${MK} install
+		echo ">>> Now rebuild elwix firmware image ..."
+		;;
+	istgt)
+		cd istgt
+		./configure ${PFX}
+		${MK} clean
+		${MK}
+		install istgt ${P}/bin
+		install istgtcontrol ${P}/bin
 		echo ">>> Now rebuild elwix firmware image ..."
 		;;
 	*)