*** FWF.tmpl.orig	Thu Apr 18 07:00:06 1996
--- FWF.tmpl	Sun Apr 26 00:06:16 1998
***************
*** 33,53 ****
  
  #define WantMotifVersions 1
  
! MOTIFINC = -I/usr/MOTIF/include
! XMLIB = -L/usr/MOTIF/lib -lXm
  
  /*------------------------------------------------------------------------
  	To use a different compiler, or different compiler options
  ------------------------------------------------------------------------*/
  
  XCOMM CC = gcc
! CDEBUGFLAGS = -g
  
  /*------------------------------------------------------------------------
  	If you don't want to build the test programs, set this to 0
  ------------------------------------------------------------------------*/
  
! #define	BuildExecs	1
  
  /*------------------------------------------------------------------------
  	If you have the XPM pixmap library installed:
--- 33,53 ----
  
  #define WantMotifVersions 1
  
! MOTIFINC = -I$(X11BASE)/include
! XMLIB = $(MOTIFLIB)
  
  /*------------------------------------------------------------------------
  	To use a different compiler, or different compiler options
  ------------------------------------------------------------------------*/
  
  XCOMM CC = gcc
! CDEBUGFLAGS = -O -Wall
  
  /*------------------------------------------------------------------------
  	If you don't want to build the test programs, set this to 0
  ------------------------------------------------------------------------*/
  
! #define	BuildExecs	0
  
  /*------------------------------------------------------------------------
  	If you have the XPM pixmap library installed:
***************
*** 55,61 ****
  
  #define	HaveXpm		1
  
! XCOMM XPM_INCDIR = -I/usr/include/X11R5/X11
  XPM_LIB = -lXpm
  
  /*------------------------------------------------------------------------
--- 55,61 ----
  
  #define	HaveXpm		1
  
! XCOMM XPM_INCDIR = -I$(X11BASE)/include/X11
  XPM_LIB = -lXpm
  
  /*------------------------------------------------------------------------
***************
*** 84,90 ****
  
  IMAKE_DEFINES = -DAvoidNullMakeCommand
  
! ARMERGE = ar r
  PROJECTDIR = $(TOP)
  
  FWF_LIBBASENAME = fwf
--- 84,90 ----
  
  IMAKE_DEFINES = -DAvoidNullMakeCommand
  
! ARMERGE = ar qc
  PROJECTDIR = $(TOP)
  
  FWF_LIBBASENAME = fwf