--- install.orig	Sun Dec 10 10:08:58 2000
+++ install	Tue Jul 10 12:56:28 2001
@@ -10,16 +10,16 @@
 ED=`which ed`
 
 
-BPHOME=/usr/local/lib/bp
-PICSDIR=/usr/local/lib/pix
-BINDEST=/usr/local/bin
-SIXDIR=/usr/local/lib/sixpack
-SIXDOC=$SIXDIR/doc
+BPHOME=%%DATADIR%%/bp
+PICSDIR=%%DATADIR%%/pix
+BINDEST=%%PREFIX%%/bin
+SIXDIR=%%DATADIR%%
+SIXDOC=%%DOCSDIR%%/sixpack
 BIBXRESFILE=$SIXDIR/Bib
 
 
 # CONFDEST is the location of the configuration file.
-CONFDEST=/etc/sixpack.rc
+CONFDEST=%%PREFIX%%/etc/sixpack.rc
 # CONFDEST=~/.sixpack.rc
 
 #these will be spliced into the conf files:
@@ -58,8 +57,6 @@
 w
 q
 END
-  \rm -R $BP
-  $TAR -z-xf $BP.tar.gz
   for a in $BP/bin/*pl ; do ed $a <edcoms ; done
   
   cat >edcoms <<END
