diff -ru scid-3.4-orig/Makefile scid-3.4/Makefile
--- scid-3.4-orig/Makefile	Wed Feb  5 14:35:38 2003
+++ scid-3.4/Makefile	Wed Feb  5 14:37:43 2003
@@ -2,23 +2,24 @@
 
 ### Compiler: Most Unix systems use g++ for compiling and linking.
 #
-COMPILE = g++
-CC = gcc
-LINK = g++
+COMPILE = c++
+CC = cc
+LINK = c++
 DESTDIR =
+prefix = /usr/local
 
 # BINDIR: where the Scid programs are copied for "make install".
 #
-BINDIR = /usr/local/bin
+BINDIR = $(prefix)/bin
 
 # SHAREDIR: where scid.eco and spelling.ssp are copied for "make install".
 #
-SHAREDIR = /usr/local/share/scid
+SHAREDIR = $(prefix)/share/scid
 
 ### TCL_VERSION: Set this according to the version of Tcl/Tk you have
 #   installed that you want Scid to use: 8.0, 8.1, 8.2, 8.3, etc.
 #
-TCL_VERSION = 8.3
+TCL_VERSION = 8.4
 
 # TCL_INCLUDE, TCL_LIBRARY, TK_LIBRARY: these are the compiler options
 #    needed for linking Scid with Tcl/Tk.  The program "./configure"
@@ -27,15 +28,15 @@
 #
 # You have not run "./configure" yet.  The default settings are:
 #
-TCL_INCLUDE = -I/usr/include
-TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
+TCL_INCLUDE = -I$(prefix)/include -I/usr/X11R6/include
+TCL_LIBRARY = -L$(prefix)/lib -ltcl$(TCL_VERSION) -ldl
 TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/lib -lX11
 
 ### Here are other commonly used settings for the Tcl/Tk compiler options:
 
 ### Linux (Red Hat and other distributions):
-# TCL_INCLUDE = -I /usr/include
-# TCL_LIBRARY = -L /usr/lib -ltcl$(TCL_VERSION) -ldl
+# TCL_INCLUDE = -I $(prefix)/include
+# TCL_LIBRARY = -L $(prefix)/lib -ltcl$(TCL_VERSION) -ldl
 # TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L /usr/X11R6/lib -lX11
 
 ### Solaris:
@@ -183,6 +184,7 @@
 
 old-install: all
 	chmod 755 scid $(SCRIPTS) $(EXECS)
+	-mkdir -p $(BINDIR)
 	cp scid $(SCRIPTS) $(EXECS) $(BINDIR)
 	-mkdir -p $(SHAREDIR)
 	-chmod a+rx $(SHAREDIR)
Only in scid-3.4: Makefile.rej
Only in scid-3.4: Makefile~