*** Makefile.orig	Wed Nov  5 02:39:24 1997
--- Makefile	Sun Nov  9 10:32:13 1997
***************
*** 22,29 ****
  #
  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
  #
! CC = gcc
! CFLAGS = -g -Wall
  
  OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
  
--- 22,29 ----
  #
  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
  #
! #CC = gcc
! #CFLAGS = -g -Wall
  
  OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
  
***************
*** 55,61 ****
  # files with a ".gz" extension.  If you don't care about HBF fonts, just
  # comment this line out.
  #
! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
  
  #
  # Set the defines used for all files except the HBF support.
--- 55,61 ----
  # files with a ".gz" extension.  If you don't care about HBF fonts, just
  # comment this line out.
  #
! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
  
  #
  # Set the defines used for all files except the HBF support.
***************
*** 65,72 ****
  #
  # Uncomment these for SunOS.
  #
! INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
! LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
  
  #
  # Uncomment these for Solaris.
--- 65,72 ----
  #
  # Uncomment these for SunOS.
  #
! #INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
! #LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
  
  #
  # Uncomment these for Solaris.
***************
*** 80,87 ****
--- 80,96 ----
  #INCS = -I/usr/X11/include -I/usr/Motif-2.0.1/include $(FTYPE_INCS)
  #LIBS = -L/usr/Motif-2.0.1/lib -lXm -L/usr/X11/lib -lXpm -lXmu -lXt -lX11 -lSM -lICE $(FTYPE_LIBS)
  
+ INCS = -I${X11BASE}/include
+ LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext
+ 
  
  all: xmbdfed
+ 
+ install: xmbdfed
+ 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 		xmbdfed ${X11BASE}/bin/xmbdfed
+ 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
+ 		xmbdfed.man ${X11BASE}/man/man1/xmbdfed.1
  
  xmbdfed: $(OBJS)
  	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)