--- Makefile.orig	Mon May  3 19:17:50 1999
+++ Makefile	Mon Nov  1 13:41:33 1999
@@ -23,8 +23,8 @@
 #
 # $Id: Makefile,v 1.8 1999/05/03 17:17:50 mleisher Exp $
 #
-CC = gcc
-CFLAGS = -g -Wall
+#CC = gcc
+#CFLAGS = -g -Wall
 
 OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
         xmbdfedrc xmbdfed.man
@@ -47,17 +47,19 @@
 # Uncomment these if you have the FreeType library and want to use it to
 # import TrueType fonts.
 #
-#FTYPE_INCS = -I/usr/local/include
-#FTYPE_LIBS = -L/user/local/lib -lttf
-#FTYPE_DEFS = -DHAVE_FREETYPE
+.if defined(USE_FREETYPE)
+FTYPE_INCS = -I${LOCALBASE}/include
+FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
+FTYPE_DEFS = -DHAVE_FREETYPE
+.endif
 
 #
 # Uncomment these if you have the hbf.h and hbf.c files in the current
 # directory and the patch has been applied.
 #
-#HBF_HDRS = hbf.h
-#HBF_OBJS = hbf.o
-#HBF_DEFS = -DHAVE_HBF
+HBF_HDRS = hbf.h
+HBF_OBJS = hbf.o
+HBF_DEFS = -DHAVE_HBF
 
 #
 # Specify the various defines needed for HBF fonts.  If you do not have GNU
@@ -65,7 +67,7 @@
 # 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\""
+HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
 
 #
 # Set the defines used for all files except the HBF support.
@@ -83,9 +85,9 @@
 #
 # Uncomment these for Solaris.
 #
-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
-       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+#       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
 
 #
 # Uncomment these for Linux.
@@ -131,7 +133,15 @@
 #LIBS = -L/usr/Motif-1.2/lib32 -lXm \
 #       -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
 
+INCS = -I${X11BASE}/include ${FTYPE_INCS}
+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS}
+
+
 all: xmbdfed
+
+install: xmbdfed
+	${BSD_INSTALL_PROGRAM} xmbdfed ${PREFIX}/bin/xmbdfed
+	${BSD_INSTALL_MAN} xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1
 
 xmbdfed: $(OBJS)
 	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)