--- Makefile	2004-12-09 14:48:16.000000000 -0600
+++ Makefile.new	2004-12-09 15:12:42.871959688 -0600
@@ -50,7 +50,7 @@
 #
 
 # Install point for the tadsc, tadsr, and tdb executables
-BINDIR=/usr/local/bin
+BINDIR=usr/bin
 
 #
 # Places to look for include files.
@@ -221,16 +221,16 @@
 # In 2.95.3 it works fine. Uncomment it if you think it's safe and are hoping
 # for a performance boost.
 #
-#CC=gcc
-#OPTIMIZE=-O2 -funroll-loops -mcpu=pentiumpro -fno-strict-aliasing # -fomit-frame-pointer
-#UNIXFLAGS=-DOSANSI -DUNIX -DHAVE_STRCASECMP
-#SYSFLAGS= -DOS_SYSTEM_NAME=\""LINUX_386"\" -DSYSNAME=\""i386+ running Linux"\" -DSYSPL=\"1\" -DPORTER=\""$(STEPHEN)"\" -DSYSMAINTAINER=\""Linux port maintained by $(STEPHEN)\n"\"
-#CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DHAVE_TPARM -DLINUX_386
-#AFLAGS=
-#OVLFLG=
-#MACHDEP=
-#LIBS=-lncurses
-#MAKEXEC=touch
+CC=gcc
+OPTIMIZE=-O2 -funroll-loops -mcpu=pentiumpro -fno-strict-aliasing # -fomit-frame-pointer
+UNIXFLAGS=-DOSANSI -DUNIX -DHAVE_STRCASECMP
+SYSFLAGS= -DOS_SYSTEM_NAME=\""LINUX_386"\" -DSYSNAME=\""i386+ running Linux"\" -DSYSPL=\"1\" -DPORTER=\""$(STEPHEN)"\" -DSYSMAINTAINER=\""Linux port maintained by $(STEPHEN)\n"\"
+MY_CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DHAVE_TPARM -DLINUX_386
+AFLAGS=
+OVLFLG=
+MACHDEP=
+LIBS=-lncurses
+MAKEXEC=touch
 
 #
 # FreeBSD 2.1.x
@@ -374,39 +374,39 @@
 all: tadsr tadsc tdb
 
 install: all
-	install -d $(BINDIR)
-	install -s -m755 tadsc tadsr tdb $(BINDIR)
+	install -d $(DESTDIR)$(BINDIR)
+	install -s -m755 tadsc tadsr tdb $(DESTDIR)$(BINDIR)
 
 tadsr: $(TROBJS)
-	$(CC) $(CFLAGS) $(TROBJS) -o tadsr $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TROBJS) -o tadsr $(LIBS)
 	$(MAKEXEC) tadsr
 
 tadsc: $(TCOBJS)
-	$(CC) $(CFLAGS) $(TCOBJS) -o tadsc $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TCOBJS) -o tadsc $(LIBS)
 	$(MAKEXEC) tadsc
 
 tdb: $(TDBOBJS)
-	$(CC) $(CFLAGS) $(TDBOBJS) -o tdb $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TDBOBJS) -o tdb $(LIBS)
 	$(MAKEXEC) tdb
 
 tadsr.static: $(TROBJS)
-	$(CC) $(CFLAGS) $(TROBJS) -static -o tadsr.static $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TROBJS) -static -o tadsr.static $(LIBS)
 	strip tadsr.static
 
 tadsc.static: $(TCOBJS)
-	$(CC) $(CFLAGS) $(TCOBJS) -static -o tadsc.static $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TCOBJS) -static -o tadsc.static $(LIBS)
 	strip tadsc.static
 
 tdb.static: $(TDBOBJS)
-	$(CC) $(CFLAGS) $(TDBOBJS) -static -o tdb.static $(LIBS)
+	$(CC) $(CFLAGS) $(MY_CFLAGS) $(TDBOBJS) -static -o tdb.static $(LIBS)
 	strip tdb.static
 
 # Object files compiled with USE_STDIO. These are used only for the TADS 2 and
 # TADS 3 compilers, which do not require a curses-type interface.
 osunixt_stdio.o: osunixt.c
-	$(CC) -c $(CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) -DUSE_STDIO -o $@ osunixt.c
+	$(CC) -c $(CFLAGS) $(MY_CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) -DUSE_STDIO -o $@ osunixt.c
 osgen3_stdio.o: osgen3.c
-	$(CC) -c $(CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) -DUSE_STDIO -o $@ osgen3.c
+	$(CC) -c $(CFLAGS) $(MY_CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) -DUSE_STDIO -o $@ osgen3.c
 
 #
 # prscomp.c gets hosed by the optimizer on some machines, so we
@@ -416,10 +416,10 @@
 # since I don't remember how to test for it.  :)
 #
 prscomp.o: prscomp.c
-	$(CC) -c $(CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) prscomp.c
+	$(CC) -c $(CFLAGS) $(MY_CFLAGS) $(UNIXPATCHLEVEL) $(INCLUDES) prscomp.c
 
 .c.o:
-	$(CC) -c $(OPTIMIZE) $(UNIXPATCHLEVEL) $(CFLAGS) $(INCLUDES) $*.c
+	$(CC) -c $(UNIXPATCHLEVEL) $(CFLAGS) $(MY_CFLAGS) $(INCLUDES) $*.c
 
 
 clean: