--- elwix/build_romfs.sh	2014/02/25 22:49:30	1.7.6.1
+++ elwix/build_romfs.sh	2016/11/14 00:56:05	1.8.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_romfs.sh,v 1.7.6.1 2014/02/25 22:49:30 misho Exp $
+# $Id: build_romfs.sh,v 1.8.2.1 2016/11/14 00:56:05 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -53,7 +53,6 @@ build_romfs()
 	install -d lib/geom;
 	install -d libdata;
 	install -d libexec;
-	install -d libexec/casper;
 	install -d local;
 	install -d local/bin;
 	install -d local/lib;
@@ -97,10 +96,11 @@ install_romfs()
 	install -v ${CFGDIR}/root.skel/profile $SKEL/dot.profile;
 	install -v ${CFGDIR}/root.skel/vimrc $SKEL/dot.vimrc;
 
-	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
 	find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \;
 	find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \;
-	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/usr/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
+	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
 
 	InstallList ${ELWIX_ROMFS} ${WORLD} ${ROMFS}
 
@@ -108,7 +108,6 @@ install_romfs()
 	InstallDir ${WORLD}/usr/local/sbin $SBIN
 	InstallDir ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
-	InstallDir ${WORLD}/libexec/casper $LIBEXEC/casper
 
 	chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
 }
@@ -134,10 +133,10 @@ build_image()
 }
 
 ### main()
-clean_romfs
-build_romfs
+clean_romfs || exit 1
+build_romfs || exit 1
 
-install_romfs
-build_image
+install_romfs || exit 1
+build_image || exit 1
 
 echo "+++ Complete build ELWIX RomFS"