--- Makefile.orig	Mon Jul 13 11:44:32 1998
+++ Makefile	Wed Jul 22 16:12:08 1998
@@ -44,14 +44,14 @@
 ### you need to localize the paths on these lines
 
 #WISH = /usr/sww/tcl-8.0/bin/wish
-WISH = /private/share/bin/wish
+#WISH = /private/share/bin/wish
 #WISH = /private/share/bin/wish8.1
-#WISH = /usr/local/bin/wish8.0
+WISH = ${PREFIX}/bin/wish8.2
 
 # the executable `tkman' is placed in BINDIR
 # this should be a directory that's in your bin PATH
-BINDIR = /private/share/bin
-#BINDIR = /usr/local/bin
+#BINDIR = /private/share/bin
+BINDIR = ${PREFIX}/bin
 
 
 # OPTIONAL
@@ -61,19 +61,20 @@
 # This directory should not have any Texinfo source itself.
 # More information is given in tkman-help.html
 # if you don't have Texinfo files, leave this variable empty
-texinfodir = ""
+#texinfodir = ""
 #texinfodir = /home/orodruin/h/bair/phelps/spine/tkman/info
-#texinfodir = /usr/local/info
+texinfodir = ${PREFIX}/info
 # In order to search within Texinfo files you need a grep, such as GNU grep 2.1,
 # that can report byte offsets (with the -b switch).  This needs to be
 # gzgrep if you'll be searching in compressed Texinfo source.
-gzgrep = ""
+#gzgrep = ""
 #gzgrep = "gzgrep -E"
 #gzgrep = "gzgrep -Ew"
 # Linux calls it zgrep
 #gzgrep = "zgrep -E"
 # if you don't compress your Texinfo source, this is fine
 #gzgrep = grep
+gzgrep = "/usr/bin/zgrep -E"
 
 # OPTIONAL
 # directory root of hierarchy of RFC files, with "rfc-index.txt" at the root
@@ -97,10 +98,12 @@
 # will examine for matches if a search in the usual locations fails while searching
 # for a man pages and displaying its associated binaries (if any).
 # Use this feature carefully as a large number of directories can slow down startup.
-mastermen = "/usr/man /usr/local/man"
+#mastermen = "/usr/man /usr/local/man"
 #mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man /usr/kerberos/man"
-masterbin = "/usr/bin /usr/local/bin"
+mastermen = "${PREFIX}/man /usr/share/man ${X11BASE}/man"
+#masterbin = "/usr/bin /usr/local/bin"
 #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin"
+masterbin = "/usr/bin ${PREFIX}/bin ${X11BASE}/bin"
 
 
 # names of common printers, in addition to default printer (PRINTER or LPDEST)
@@ -130,7 +133,7 @@
 # Lines are cached in .../man/cat<n>@<line-length>; 
 #   that is, the line length is appended to the usual cache directory names
 #manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null}
-manformat = {groff -te -Tlatin1 -man /tmp/ll - 2>/dev/null}
+#manformat = {groff -te -Tlatin1 -man /tmp/ll - 2>/dev/null}
 # Ultrix users should uncomment the following line (you don't have eqn)
 #manformat = {tbl | nroff -man }
 # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff
@@ -138,7 +141,7 @@
 #  space between the .de and the macro name, and groff doesn't like this.)
 #manformat = {tbl | neqn | nroff -man }
 # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc
-#manformat = {groff -Tascii -te -mandoc}
+manformat = {groff -Tascii -te -mandoc}
 # BSDI
 #manformat = {tbl | eqn -Tascii | nroff -man }
 
@@ -174,7 +177,7 @@
 
 
 # pick a printing pipeline for which your platform has all the constituants
-manprint = {groff -man -Tps -te -l}
+manprint = {groff -mandoc -Tps -te -l}
 # alternatives
 #manprint = {groff -man -Tps -te -l | psnup -n2}
 #manprint = {tbl | eqn | troff -man -t | lpr -t}
@@ -213,7 +216,7 @@
 # the right-topmost menu's Rebuild Database/Glimpse Index menu choice.
 
 # BY DEFAULT ON (Boolean scope set to entire file)
-glimpse = "glimpse -W"
+#glimpse = "glimpse -W"
 # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here
 #glimpse = ""
 # give the full path, if you'd like
@@ -221,6 +224,7 @@
 # variations (refer to the Glimpse manual page)
 # no characters treated as meta characters:
 #glimpse = "glimpse -Wk"
+glimpse = "glimpse -z"
 
 # glimpseindex indexes the manual pages, for each component of one's MANPATH,
 # and places the results in a set of files named .glimpse_* in that MANPATH
@@ -468,8 +472,8 @@
 	chmod +rx $(BINDIR)/tkman
 	$(CP) retkman $(BINDIR)
 	chmod +rx $(BINDIR)/retkman
-	@echo 'You also need RosettaMan to run TkMan.'
-	@echo 'Have you installed the elided text patch to Tk?'
+#	@echo 'You also need RosettaMan to run TkMan.'
+#	@echo 'Have you installed the elided text patch to Tk?'
 
 test: dox tkman
 	cp tkman $(BINDIR)