*** build.orig	Wed Oct 31 16:01:04 2001
--- build	Sun Dec  2 23:17:05 2001
***************
*** 332,351 ****
  	  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
!         if [ -s ipopd    ] ; then rm -f ipopd    ; fi
!         ln -s imap/ipopd ipopd
!         echo "Making c-client library, imapd, and ipopd"
! 	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
!         cd $PHOME/imap
!         eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
!         eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
!         echo ''
  
          echo "Making Pico and Pilot"
          cd $PHOME/pico
--- 332,351 ----
  	  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
! #        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
! #        ln -s imap/ipopd ipopd
! #        echo "Making c-client library, imapd, and ipopd"
! #	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
! #        cd $PHOME/imap
! #        eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
! #        eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
! #        echo ''
  
          echo "Making Pico and Pilot"
          cd $PHOME/pico
***************
*** 362,379 ****
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
          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 ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
!         if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
!         if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
!         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          cd $PHOME
          echo ''
          echo "Links to executables are in bin directory:"
!         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
--- 362,379 ----
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
          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 ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
! #        if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
! #        if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
! #        if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          cd $PHOME
          echo ''
          echo "Links to executables are in bin directory:"
!         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
***************
*** 410,424 ****
  
      clean) # This only sort of works 
          rm -f c-client mtest imapd ipopd
!         echo "Cleaning c-client and imapd"
! 	cd $PHOME/imap
! 	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine
!         make -f makefile.ult clean
          echo "Cleaning pico"
          cd $PHOME/pico
!         make $makeargs -f makefile.ult clean
          echo "Done"
          cd $PHOME
          ;;
--- 410,424 ----
  
      clean) # This only sort of works 
          rm -f c-client mtest imapd ipopd
! #        echo "Cleaning c-client and imapd"
! #	cd $PHOME/imap
! #	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine
!         make -f makefile.bsf clean
          echo "Cleaning pico"
          cd $PHOME/pico
!         make $makeargs -f makefile.bsf clean
          echo "Done"
          cd $PHOME
          ;;