--- Makefile.orig	Sat Mar 14 14:57:48 1998
+++ Makefile	Tue Jan 29 14:22:02 2008
@@ -5,10 +5,8 @@ SHELL = /bin/sh
 
 ### EDIT THE NEXT LINES ONLY ###
 
-PREFIX = /usr/local
-
 # The directory where the tkhylafax library will be installed
-TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
+TCLLIB_DEST = $(PREFIX)/lib/tkhylafax
 
 # The directory where the tkhylafax command will be installed
 TCLPRG_DEST = $(PREFIX)/bin
@@ -17,13 +15,13 @@ TCLPRG_DEST = $(PREFIX)/bin
 TCLMAN_DEST = $(PREFIX)/man/man1
 
 # The full path to tclsh
-TCLSH = /usr/bin/tclsh
+TCLSH = ${MODTCL_BIN}
 
 # The full path to wish.
-WISH = /usr/bin/wish
+WISH = ${MODTK_BIN}
 
 # The full path to your postscript viewer
-GHOSTVIEW = /usr/X11/bin/gv
+GHOSTVIEW = ${LOCALBASE}/bin/gv
 
 ### DON'T EDIT ANYTHING BELOW THIS LINE ###
 
@@ -52,7 +50,6 @@ TCLMAN_FILE = tkhylafax
 
 all:
 	$(MAKE) build
-	$(MAKE) install
 
 build: Makefile
 	@echo "Patching tkhylafax..."
@@ -66,24 +63,24 @@ install: install.lib install.man install.tkhylafax
 
 $(TCLLIB_DEST):
 	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
-	chmod 775 $(TCLLIB_DEST)
+	chmod 755 $(TCLLIB_DEST)
 
 install.lib: $(TCLLIB_DEST)
 	@echo "Installing tkhylafax library..." 
 	-for i in $(TCLLIB_FILES) ; do \
 	    cp $$i $(TCLLIB_DEST)/$$i ; \
-	    chmod 664 $(TCLLIB_DEST)/$$i ; \
+	    chmod 644 $(TCLLIB_DEST)/$$i ; \
 	done
 	@echo "Done" 
 
 $(TCLPRG_DEST):
 	if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi
-	chmod 775 $(TCLPRG_DEST)
+	chmod 755 $(TCLPRG_DEST)
 
 install.tkhylafax: $(TCLPRG_DEST) $(TCLPRG_FILE) 
 	@echo "Installing tkhylafax command..." 
 	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$(TCLPRG_FILE)
-	chmod 775 $(TCLPRG_DEST)/$(TCLPRG_FILE)
+	chmod 755 $(TCLPRG_DEST)/$(TCLPRG_FILE)
 	@echo "Done" 
 
 install.man:
