Fix location of binaries and make sure they get there. Still experimental.

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 915cb71a965c7ebc437b4cfe18a2c6a72cdd3545..d48d860e0be409a1835b087b9ce51110a23297b3 100644 (file)
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -251,8 +251,8 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 #      --with-nisplus-home \
 #      --with-acl-support \
 
-make all nsswitch/libnss_wins.so torture nsswitch/pam_winbind.so everything
-make tdb/tdbdump tdb/tdbtest tdb/tdbtorture tdb/tdbtool
+make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
+(cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
 
 
 %Install
@@ -290,10 +290,9 @@ for i in talloctort samsync locktest locktest2 masktest msgtest smbtorture
 do
        install -m 755 source/bin/$i $DESTDIR/usr/sbin
 done
-for i in talloctort samsync locktest locktest2 masktest msgtest smbtorture
-       tdb/tdbdump tdb/tdbtest tdb/tdbtorture tdb/tdbtool
+for i in tdbdump tdbtest tdbtorture tdbtool
 do
-       install -m 755 source/$i $DESTDIR/usr/sbin
+       install -m 755 source/tdb/$i $DESTDIR/usr/sbin
 done
 
 #mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin
@@ -302,6 +301,7 @@ done
 
 # Install the nsswitch library extension file
 cp -p source/nsswitch/libnss_wins.so $DESTDIR/lib
+cp -p source/nsswitch/libnss_winbind.so $DESTDIR/lib
 cp -p source/nsswitch/pam_winbind.so $DESTDIR/lib/security
 # Make link for wins resolver
 ( cd $DESTDIR/lib; ln -s libnss_wins.so libnss_wins.so.2 )