--- Common.tmpl.dist.orig	Wed May 28 02:44:33 1997
+++ Common.tmpl.dist	Sun Feb 21 21:23:21 1999
@@ -25,7 +25,7 @@
  * CMANDIR  - manual pages (not used)
  */
 CBINDIR = $(BINDIR)
-CUTILDIR = $(BINDIR)
+CUTILDIR = $(LIBDIR)/chimera
 CLIBDIR = $(LIBDIR)/chimera
 CMANDIR = $(MANDIR)
 
@@ -91,7 +91,7 @@
 #define NEED_STRCASECMP 0
 
 CEXTRA_DEFINES = -DHAVE_MKTIME -DHAVE_STDLIB_H -DHAVE_STRING_H \
-                 -DHAVE_UNISTD_H -DHAVE_MALLOC_H
+                 -DHAVE_UNISTD_H
 
 /*
  * OSF1 needs -D_BSD
--- Imakefile.orig	Wed May 28 02:44:33 1997
+++ Imakefile	Sun Feb 21 12:17:07 1999
@@ -1,5 +1,5 @@
 #define IHaveSubDirs
-#define PassCDebugFlags 'CDEBUGFLAGS=-g -O0'
+#define PassCDebugFlags "CDEBUGFLAGS=-g ${CFLAGS}"
 
 SUBDIRS = compat libhtmlw mxw xloadimage common src lib util
 
--- lib/protocol.orig	Sat Apr 19 07:07:07 1997
+++ lib/protocol	Sun Feb 21 11:42:50 1999
@@ -9,4 +9,4 @@
 #
 #nntp                /home/john/bin/access_nntp
 
-mailto		/usr/X11/bin/mailto.pl
+mailto		/usr/X11R6/lib/X11/chimera/mailto.pl
--- src/Imakefile.orig	Wed May 28 02:44:35 1997
+++ src/Imakefile	Sun Feb 21 11:42:50 1999
@@ -28,7 +28,7 @@
                    -L../xloadimage -lxloadimage $(COMPATLIB) \
                    -L../common -lcommon \
                    $(CSOCKSLIB) $(CTERMLIB) $(CEXTRA_LIBS) \
-                   XawClientLibs -lm
+                   XawClientLibs -lm -lxpg4
 
 #ifdef __QNX__
 LOCAL_DEPLIBS    = ../common/common3r.lib ../mxw/mxw3r.lib \