--- build.orig	Mon Nov 15 14:16:25 1999
+++ build	Wed Jul  5 21:22:26 2000
@@ -80,8 +80,9 @@
  pine   The Pine mailer. Once compiled this should work just fine on
         your system with no other files than this binary, and no
         modifications to your system. Optionally you may create two
-        configuration files, /usr/local/lib/pine.conf and 
-        /usr/local/lib/pine.info. See the documentation for details.
+        configuration files, /usr/local/etc/pine.conf and 
+        /usr/local/etc/pine.info. See the documentation for details.
+
  
  pico   The standalone editor similar to the Pine message composer.
         This is a very simple straight forward text editor.
@@ -277,17 +278,17 @@
 	  esac
 	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" "$K1" "$K2" $ccltarg
-        cd $PHOME/imap
-        eval make "$makeargs" "$K1" "$K2" $ccltarg
-        echo ''
+#        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" "$K1" "$K2" $ccltarg
+#        cd $PHOME/imap
+#        eval make "$makeargs" "$K1" "$K2" $ccltarg
+#        echo ''
 
         echo "Making Pico and Pilot"
         cd $PHOME/pico
@@ -304,14 +305,14 @@
         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 ../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
@@ -321,15 +322,15 @@
 
 
     clean) # This only sort of works 
-        echo "Cleaning c-client and imapd"
-	cd $PHOME/imap
-	make clean
+#        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.bsf clean
         echo "Cleaning pico"
         cd $PHOME/pico
-        make $makeargs -f makefile.ult clean
+        make $makeargs -f makefile.bsf clean
         echo "Done"
         cd $PHOME
         ;;