--- build.orig	Thu Jan  4 13:13:11 2001
+++ build	Thu Jan 18 10:30:01 2001
@@ -309,18 +309,6 @@
 	  echo "Including SSL functionality"
 	fi
 
-        if [ -s c-client ] ; then rm -f c-client ; fi
-        ln -s imap/c-client c-client
-        if [ -s mtest    ] ; then rm -f mtest    ; fi
-        ln -s imap/mtest mtest
-        if [ -s imapd    ] ; then rm -f imapd    ; fi
-        ln -s imap/imapd imapd
-        echo "Making c-client library, mtest and imapd"
-        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-        cd $PHOME/imap
-        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-        echo ''
-
         echo "Making Pico and Pilot"
         cd $PHOME/pico
         eval echo make "$makeargs" -f makefile.$picotarg
@@ -336,14 +324,12 @@
         cd $PHOME/bin
         rm -f pine mtest imapd pico pilot
         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
         cd $PHOME
         echo ''
         echo "Links to executables are in bin directory:"
-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
+        size bin/pine bin/pico bin/pilot
 	case $maketarg in
 	    mnt)    echo "Fixing stacksizes ..."
 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
@@ -353,15 +339,12 @@
 
 
     clean) # This only sort of works 
-        echo "Cleaning c-client and imapd"
-	cd $PHOME/imap
-	make clean
         echo "Cleaning Pine"
         cd $PHOME/pine
-        make -f makefile.ult clean
+        make -f makefile.bso clean
         echo "Cleaning pico"
         cd $PHOME/pico
-        make $makeargs -f makefile.ult clean
+        make $makeargs -f makefile.bso clean
         echo "Done"
         cd $PHOME
         ;;