1 files changed, 25 insertions, 7 deletions
diff --git a/packaging/Caldera/OpenServer/Install b/packaging/Caldera/OpenServer/Install
index ab27b6f67fa..67ea438cd0c 100755
--- a/packaging/Caldera/OpenServer/Install
+++ b/packaging/Caldera/OpenServer/Install
@@ -12,7 +12,7 @@ V=
 PATH=/usr/local/bin:$PATH
 export PATH
 
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
 HERE=`pwd`
 PKGDIR=packaging/Caldera/OpenServer
 
@@ -20,6 +20,9 @@ BUILD_ROOT=${HERE}/dist
 BLDFIX=${BUILD_ROOT}/${PREFIX}
 $V rm -rf $BUILD_ROOT
 $V mkdir -p $BUILD_ROOT/etc/init.d
+$V mkdir -p $BUILD_ROOT/etc/samba.d
+$V mkdir -p $BUILD_ROOT/usr/lib/mkdev
+$V mkdir -p $BUILD_ROOT/doc
 $V mkdir -p ${BLDFIX}/bin
 $V mkdir -p ${BLDFIX}/sbin
 $V mkdir -p ${BLDFIX}/swat/using_samba/gifs
@@ -49,8 +52,7 @@ cd ../../..
 
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool \
-      smbsh
+      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool
 do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/bin
 done
@@ -60,11 +62,16 @@ $V    install -m755 source/script/$i ${BLDFIX}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat debug2html smbtorture smbfilter locktest2 masktest
+for i in smbd nmbd swat debug2html smbfilter
 do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/sbin
 done
 
+# Install VFS libraries
+$V install -m644 -s examples/VFS/block/block.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/audit.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/recycle/recycle.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/skel.so ${BLDFIX}/lib
 
 # Install level 1 man pages
 for i in *.1
@@ -111,7 +118,6 @@ $V    install -m644 $i ${BLDFIX}/swat/using_samba/gifs
 done
 
 # Install the miscellany
-$V install -m644 swat/README ${BLDFIX}/swat
 $V install -m644 docs/manpages/smb.conf.5 ${BLDFIX}/man/man.5
 $V install -m644 docs/manpages/lmhosts.5 ${BLDFIX}/man/man.5
 $V install -m644 docs/manpages/smbpasswd.5 ${BLDFIX}/man/man.5
@@ -123,12 +129,24 @@ $V install -m644 docs/manpages/swat.8 ${BLDFIX}/man/man.8
 $V install -m644 docs/manpages/smbmount.8 ${BLDFIX}/man/man.8
 $V install -m644 docs/manpages/smbmnt.8 ${BLDFIX}/man/man.8
 $V install -m644 docs/manpages/smbumount.8 ${BLDFIX}/man/man.8
-$V install -m644 ${PKGDIR}/smb.conf ${BLDFIX}/lib/smb.conf
-$V install -m644 ${PKGDIR}/smbusers $BUILD_ROOT/etc/smbusers
+$V install -m644 examples/VFS/recycle/recycle.conf ${BLDFIX}/lib
+$V install -m644 examples/VFS/block/samba-block.conf ${BUILD_ROOT}/etc/samba.d
+$V install -m644 ${PKGDIR}/example.block.smb.conf ${BUILD_ROOT}/etc/samba.d
+$V install -m644 ${PKGDIR}/smb.conf $BUILD_ROOT/etc/samba.d/smb.conf.default
+$V install -m644 ${PKGDIR}/smbusers $BUILD_ROOT/etc/samba.d/smbusers
+$V install -m644 ${PKGDIR}/lmhosts $BUILD_ROOT/etc/samba.d/lmhosts
 $V install -m755 ${PKGDIR}/smbprint ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/findsmb ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/smbadduser ${BLDFIX}/bin
+$V install -m755 ${PKGDIR}/initconfig ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/smb.init $BUILD_ROOT/etc/init.d/samba
+$V install -m755 ${PKGDIR}/smb.mkdev $BUILD_ROOT/usr/lib/mkdev/samba
+$V install -m644 ${PKGDIR}/docview.html $BUILD_ROOT/doc/index.html
+$V install -m644 ${PKGDIR}/osr5config.html $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/callogo.gif $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/samba.desktop $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/samba.directory $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/swat.readme ${BLDFIX}/swat/README
 
 # The following is now done in the postinstall script
 #