*** Imakefile.orig	Mon Oct  4 15:51:08 1999
--- Imakefile	Sun Feb 13 19:01:33 2000
***************
*** 11,17 ****
  #undef  USE_SOUND
  #define XPM
  #define USEM4
! #undef X11R6
  #define I18N
  
           YFLAGS = -d
--- 11,17 ----
  #undef  USE_SOUND
  #define XPM
  #define USEM4
! #define X11R6
  #define I18N
  
           YFLAGS = -d
***************
*** 19,26 ****
         LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
  
  #ifdef XPM
!       XPMLIBDIR = 
!       XPMINCDIR = 
  
       XPMDEFINES = -DXPM
           XPMLIB = $(XPMLIBDIR) -lXpm
--- 19,26 ----
         LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
  
  #ifdef XPM
!       XPMLIBDIR = -L/usr/X11R6/lib
!       XPMINCDIR = -I/usr/X11R6/include
  
       XPMDEFINES = -DXPM
           XPMLIB = $(XPMLIBDIR) -lXpm
***************
*** 44,52 ****
  #endif
  
  #ifdef USEM4
     M4LIBDIR =
     M4INCDIR =
!   M4DEFINES = -DUSEM4
        M4LIB = $(M4LIBDIR)
  #else
     M4LIBDIR = 
--- 44,53 ----
  #endif
  
  #ifdef USEM4
+      M4PROG = ${LOCALBASE}/bin/gm4
     M4LIBDIR =
     M4INCDIR =
!   M4DEFINES = -DUSEM4 -DM4PROG=\"${M4PROG}\"
        M4LIB = $(M4LIBDIR)
  #else
     M4LIBDIR =