--- Imakefile.orig     Tue Mar 31 02:59:36 1998
+++ Imakefile  Sun Jun 13 13:44:39 1999
@@ -4,7 +4,7 @@
 XCOMM We need /usr/include, the current src dir, the parent of this
 XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir
 
-EXTRA_INCLUDES =  -I../Xm -I/usr/openwin/include -I$(INCROOT) -I./ -I../
+EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${X11BASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I..
 
 
 XCOMM   `Compile time defines: 
@@ -18,19 +18,19 @@
 XCOMM                    This hasn't yet been tested.
 XCOMM   -DNO_EDITRES     If your X release doesn't have Xmu/Editres.h
 
-CFLAGS= -g -DFALLBACK $(EXTRA_INCLUDES)
+CFLAGS+=-DFALLBACK $(EXTRA_INCLUDES)
 
 
 XCOMM  Location of Motif library. If Motif 2.0, add the location of
 XCOMM  the Xpm library also
 
-XMLIB= -L../Xm -lXm ../Xm/libXpm.a
+XMLIB=${MOTIFLIB} -lXp
 
 LOCAL_LIBRARIES = ../imap-4/c-client/c-client.a
 
 
-OTHERLIBS=-lgen
-ML_LIBDIR=/usr/local/lib/ml
+OTHERLIBS=-lcrypt
+ML_LIBDIR=${X11BASE}/lib/X11/ml
 HELP_FILES=`find ../lib -type f -print`
 
 XCOMM  Default font sizes. Linux folks will want FONTSIZE=14 (or