--- Makefile	2004-12-09 15:38:20.101265312 -0600
+++ Makefile.new	2004-12-09 15:53:33.231448424 -0600
@@ -14,7 +14,7 @@
 # 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  = $(DESTDIR)usr/local
 BINDIR  = $(PREFIX)/bin
 DOCDIR  = $(PREFIX)/doc/tads3
 DATADIR = $(PREFIX)/share/tads3
@@ -89,11 +89,11 @@
 #
 #CXX          = g++
 #CC           = gcc
-#IDENT        = -DLINUX_386 -DOS_SYSTEM_NAME=\"Linux\"
+IDENT        = -DLINUX_386 -DOS_SYSTEM_NAME=\"Linux\"
 #OPTIMIZE     = -O2 -mcpu=pentiumpro -fno-strict-aliasing # -fomit-frame-pointer
 #CXX_OPTIMIZE = -fno-strict-aliasing # -fno-exceptions
-#OS_FLAGS     = -DOS_ANSI -DHAVE_TPARM -DHAVE_STRCASECMP -Dmemicmp=strncasecmp
-#DISPLAY_LIB  = -lncurses
+OS_FLAGS     = -DOS_ANSI -DHAVE_TPARM -DHAVE_STRCASECMP -Dmemicmp=strncasecmp
+DISPLAY_LIB  = -lncurses
 
 ###########################################################################
 # FreeBSD
@@ -190,8 +190,8 @@
 
 INCLUDE_DIRS = -I. -I$(T2_DIR) -I$(T2_DIR)/unix
 
-CFLAGS = $(CFLAGS_DEBUG) -c $(IDENT) $(OPTIMIZE) $(OS_FLAGS) $(INCLUDE_DIRS) -D$(T3_GLOBAL_CONFIG) -DTC_TARGET_T3 -DUNIX -DBINDIR=\"$(BINDIR)\" -DLIBDIR=\"$(LIBDIR)\" -DINCDIR=\"$(INCDIR)\" -DRESDIR=\"$(RESDIR)\"
-CXXFLAGS = $(CFLAGS) $(CXX_OPTIMIZE)
+MY_CFLAGS = $(CFLAGS_DEBUG) -c $(IDENT) $(OS_FLAGS) $(INCLUDE_DIRS) -D$(T3_GLOBAL_CONFIG) -DTC_TARGET_T3 -DUNIX -DBINDIR=\"$(BINDIR)\" -DLIBDIR=\"$(LIBDIR)\" -DINCDIR=\"$(INCDIR)\" -DRESDIR=\"$(RESDIR)\"
+MY_CXXFLAGS = $(MY_CFLAGS)
 
 ############################# Object File Lists ###########################
 
@@ -458,7 +458,7 @@
 .SUFFIXES: .c .cpp .o
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) $< -o $@
+	$(CXX) $(MY_CXXFLAGS) $(CXXFLAGS) $< -o $@
 
 .c.o:
-	$(CC) $(CFLAGS) $< -o $@
+	$(CC) $(MY_CFLAGS) $(CFLAGS) $< -o $@