diff -ruN threaded_intercal/doc/Makefile threaded_intercal-new/doc/Makefile
--- threaded_intercal/doc/Makefile	Sat Jun 27 17:33:27 1998
+++ threaded_intercal-new/doc/Makefile	Tue Sep  3 03:26:51 2002
@@ -15,11 +15,11 @@
 all: intercal.ps intercal.txt original.ps original.txt
 
 intercal.ps: intercal.mm
-	groff -dc=y -Tps    -p -t -mm intercal.mm >/dev/null
+	groff -dc=y -Tps    -p -t -mm intercal.mm >intercal.refs.tmp
 	sed <intercal.refs.tmp -e '/hn \([0-9]*\)\.$$/s//hn \1/' >tmp.refs;
 	mv tmp.refs intercal.refs.tmp
 	groff -dc=y -Tps    -p -t -mm intercal.mm >intercal.ps
-	rm intercal.refs.qrf
+	rm -f intercal.refs.qrf
 
 original.ps: intercal.mm
 	groff -dc=n -Tps    -p -t -mm intercal.mm >/dev/null
diff -ruN threaded_intercal/src/Makefile threaded_intercal-new/src/Makefile
--- threaded_intercal/src/Makefile	Wed Jul  1 13:01:05 1998
+++ threaded_intercal-new/src/Makefile	Tue Sep  3 03:43:19 2002
@@ -10,7 +10,7 @@
 
 #DVMT=~/WWW/intercal-0.17
 #dvmt=/usr/local
-DVMT=/home/malcolmr
+DVMT=@REAL_PREFIX@
 
 BINDIR = $(DVMT)/bin
 INCDIR = $(DVMT)/include
@@ -21,11 +21,11 @@
 YDEBUG = -vlt
 DEBUG	= -g -DDEBUG
 # DEBUG = -O
-CFLAGS = -I. $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
+CFLAGS = -I. -Os $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
 	-DICKLIBDIR=\"$(LIBDIR)\" -DYYDEBUG
 LDFLAGS =
 
-CC = gcc -Wall -W
+CC = gcc -Wall
 
 # You can use lex or flex
 #LEX = lex
@@ -33,7 +33,7 @@
 
 # You can use either yacc or bison
 #YACC = yacc
-YACC = bison -y
+YACC = /usr/bin/bison -y
 
 CSOURCES = ick.y lexer.l feh.c lose.c fiddle.c perpetrate.c
 ISOURCES = threads.c cesspool.c arrgghh.c ick-wrap.c
@@ -68,13 +68,13 @@
 fiddle.o: fiddle.h sizes.h
 
 libthick.a: threads.o cesspool.o lose.o fiddle.o arrgghh.o
-	ar cr libthick.a threads.o cesspool.o lose.o fiddle.o arrgghh.o
-	-ranlib libthick.a
+	ar cru libthick.a threads.o cesspool.o lose.o fiddle.o arrgghh.o
+	ranlib libthick.a
 
 install: all
-	cp thick $(BINDIR)
-	cp lose.h abcess.h fiddle.h ick-wrap.c $(INCDIR)
-	cp libthick.a ../pit/lib/syslib.i ../pit/lib/syslib.?i $(LIBDIR)
+	cp thick @INST_PREFIX@/bin
+	cp lose.h abcess.h fiddle.h ick-wrap.c @INST_PREFIX@/include
+	cp libthick.a ../pit/lib/syslib.i ../pit/lib/syslib.?i @INST_PREFIX@/lib
 
 clean:
 	rm -f yacc.* y.tab.* y.output *~ *.[oa] lexer.c ick.c lextest thick
diff -ruN threaded_intercal/src/ick.y threaded_intercal-new/src/ick.y
--- threaded_intercal/src/ick.y	Wed Jul  1 14:52:02 1998
+++ threaded_intercal-new/src/ick.y	Tue Sep  3 03:36:25 2002
@@ -257,6 +257,7 @@
 initem	:    scalar | subscr | array;
 inlist	:    initem INTERSECTION inlist		{$$=cons(INTERSECTION,$1,$3);}
 	|    initem				{$$=cons(INTERSECTION,$1,0);}
+	;
 
 /* scalars, subscript exprs & constants are permitted in READ OUT lists */
 /* new: arrays are also permitted to allow for bitwise I/0 */
diff -ruN threaded_intercal/src/perpetrate.c threaded_intercal-new/src/perpetrate.c
--- threaded_intercal/src/perpetrate.c	Wed Jul  1 13:02:39 1998
+++ threaded_intercal-new/src/perpetrate.c	Tue Sep  3 03:31:41 2002
@@ -38,16 +38,16 @@
 #include "lose.h"
 
 #ifndef ICKINCLUDEDIR
-#define ICKINCLUDEDIR "/usr/local/include"
+#define ICKINCLUDEDIR "@REAL_PREFIX@/include"
 #endif
 #ifndef ICKLIBDIR
-#define ICKLIBDIR "/usr/local/lib"
+#define ICKLIBDIR "@REAL_PREFIX@/lib"
 #endif
 #ifndef CC
 #define CC "gcc"
 #endif
 #ifndef CFLAGS
-#define CFLAGS ""
+#define CFLAGS "-O"
 #endif
 
 #ifdef USE_YYRESTART