--- tkcvs/doinstall.orig	Tue Jan  9 22:17:52 1996
+++ tkcvs/doinstall	Fri Oct 31 09:21:23 1997
@@ -5,31 +5,31 @@
 
 # Some rational and reasonable defaults.
 
-INSTALLDIR=/usr/local/lib
-BINDIR=/usr/local/bin
-MANDIR=/usr/local/man/mann
+INSTALLDIR=${PREFIX}/share
+BINDIR=${PREFIX}/bin
+MANDIR=${PREFIX}/man/man1
 
 INSTALL_PROG=./install-sh
 
 # This must be an X based editor -- do NOT use vi except via an xterm
 # or shelltool.
 
-EDITOR=nedit
+EDITOR="xedit"
 
 # Find a Tk interpreter.
  
-WISH=`which wish4.0`
+WISH=`which wish8.2`
 if [ ! -f $WISH ]; then
-  WISH=`which wish4.1`
+  WISH=`which wish4.0`
 fi
 if [ ! -f $WISH ]; then
-  echo "I cant find a Tk interpreter on your system"
+  echo "I cant find a useful Tk interpreter on your system"
   exit 1
 fi
 
 # Find where the global bitmaps are.
 
-for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
+for GDIR in /usr/X11R6/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps ${PREFIX}/include/bitmaps
 do
   if [ -d "$GDIR" ]; then
     break
@@ -62,10 +62,10 @@
 
 # Some directories we have to create.
 
-LDIR=${INSTALLDIR}/bitmaps
 TCDIR=${INSTALLDIR}/tkcvs
-mkdir -p $LDIR $TCDIR
-for dir in $LDIR $TCDIR
+LDIR=${TCDIR}/bitmaps
+mkdir -p $LDIR $TCDIR 
+for dir in $TCDIR $LDIR
 do
   if [ ! -d $dir ]; then
     echo "I cant create the directory $dir"
@@ -99,7 +99,7 @@
   fi
 done
 
-for f in *.n ../tkdiff/*.n
+for f in *.1 ../tkdiff/*.1
 do
         $INSTALL_PROG -m 444 $f $MANDIR
 done