diff -ruN tads/tads2/makefile tadsnew/tads2/makefile
--- tads/tads2/makefile	Wed Sep 25 12:43:09 2002
+++ tadsnew/tads2/makefile	Fri Feb 27 01:25:38 2004
@@ -50,7 +50,7 @@
 #
 
 # Install point for the tadsc, tadsr, and tdb executables
-BINDIR=/usr/local/bin
+BINDIR=@PREFIX@/bin
 
 #
 # Places to look for include files.
@@ -313,16 +313,16 @@
 #
 # Mac OS X / Darwin
 #
-#CC=cc
-#OPTIMIZE=-O2
-#UNIXFLAGS= -g -DOSANSI -DUNIX -DHAVE_STRCASECMP
-#SYSFLAGS= -DOS_SYSTEM_NAME=\""Darwin"\" -DSYSNAME=\""Darwin"\" -DSYSPL=\"1\" -DPORTER=\""$(MATT)"\" -DSYSMAINTAINER=\""Darwin port maintained by $(MATT)\n"\"
-#CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DDARWIN
-#AFLAGS=
-#OVFLG=
-#MACHDEP=
-#LIBS=-lncurses
-#MAKEXEC=touch
+CC=cc
+OPTIMIZE=-O2
+UNIXFLAGS= -g -DOSANSI -DUNIX -DHAVE_STRCASECMP
+SYSFLAGS= -DOS_SYSTEM_NAME=\""Darwin"\" -DSYSNAME=\""Darwin"\" -DSYSPL=\"1\" -DPORTER=\""$(MATT)"\" -DSYSMAINTAINER=\""Darwin port maintained by $(MATT)\n"\"
+CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DDARWIN
+AFLAGS=
+OVFLG=
+MACHDEP=
+LIBS=-lncurses
+MAKEXEC=touch
 
 #
 # Don't change stuff below this line unless you really know what you're doing.
diff -ruN tads/tads2/oem.h tadsnew/tads2/oem.h
--- tads/tads2/oem.h	Sat Feb  9 17:24:02 2002
+++ tadsnew/tads2/oem.h	Fri Feb 27 01:25:38 2004
@@ -60,8 +60,8 @@
  *   won't redefine it here.  
  */
 #ifndef TADS_OEM_NAME
-$$$ #define your own TADS_OEM_NAME here, similar to this:
-/* #define  TADS_OEM_NAME   "Mike Roberts" */
+/*$$$ #define your own TADS_OEM_NAME here, similar to this: */
+#define  TADS_OEM_NAME   "Alexander Strange"
 /* Please keep the size under 256 bytes */
 /* Don't use "Mike Roberts" unless your name happens to be Mike Roberts. */
 #endif
diff -ruN tads/tads3/makefile tadsnew/tads3/makefile
--- tads/tads3/makefile	Sat Sep 28 17:29:18 2002
+++ tadsnew/tads3/makefile	Fri Feb 27 22:22:31 2004
@@ -14,9 +14,9 @@
 # Installation points for TADS3. Tailor these to your liking. If you install
 # manually, DATADIR must match where you actually put the libraries and
 # resources, or the TADS3 compiler will not be able to find them.
-PREFIX  = /usr/local
+PREFIX  = @PREFIX@
 BINDIR  = $(PREFIX)/bin
-DOCDIR  = $(PREFIX)/doc/tads3
+DOCDIR  = $(PREFIX)/share/doc/tads3
 DATADIR = $(PREFIX)/share/tads3
 LIBDIR  = $(DATADIR)/libraries
 INCDIR  = $(DATADIR)/includes
@@ -169,13 +169,13 @@
 # Maintainer: Matt Herberg (meherberg@earthlink.net)                      #
 ###########################################################################
 #
-#CXX          = c++
-#CC           = cc
-#IDENT        = -DDARWIN -DOS_SYSTEM_NAME=\"Darwin\"
-#OPTIMIZE     = -O2
-#CXX_OPTIMIZE =
-#OS_FLAGS     = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD
-#DISPLAY_LIB  = -lncurses
+CXX          = g++
+CC           = gcc
+IDENT        = -DDARWIN -DOS_SYSTEM_NAME=\"Darwin\"
+OPTIMIZE     = -O2
+CXX_OPTIMIZE =
+OS_FLAGS     = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD
+DISPLAY_LIB  = -lncurses
 
 ###########################################################################
 # You shouldn't need to change anything beyond this line.                 #
@@ -208,21 +208,19 @@
 all: t3make t3run t23run t3pre
 
 install: all install-common
-	install -m755 t3make t3run t23run $(BINDIR)
+	install -m 755 t3make t3run t23run @INST@/bin
 
 install-strip: all install-common
-	install -s -m755 t3make t3run $(BINDIR)
+	install -s -m 755 t3make t3run @INST@/bin
 
 install-common: all
-	install -d $(BINDIR)
-	install -d $(DOCDIR)
-	install -d $(DATADIR)
-	rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
-	cp -rp t3include $(INCDIR)
-	cp -rp t3library $(LIBDIR)
-	cp -rp t3resource $(RESDIR)
-	cp -rp doc $(DOCDIR)
-	-chown -R root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
+	install -d @INST@/bin
+	install -d @INST@/share/doc/tads3
+	install -d @INST@/share/tads3
+	cp -rp t3include @INST@/share/tads3/includes
+	cp -rp t3library @INST@/share/tads3/libraries
+	cp -rp t3resource @INST@/share/tads3/res
+	cp -rp doc @INST@/share/doc/tads3
 
 clean:
 	rm -f *.o t3make t3run t23run t3pre test_utf8 test_chr test_pool test_err test_obj test_write test_exec test_gets test_tok test_prs test_sym test_prs_top test_comp_obj test_link test_regex test_sort iter.t3s test.t3v