--- Makefile.orig	Fri Aug  9 09:16:57 2002
+++ Makefile	Thu Nov  7 15:43:07 2002
@@ -20,7 +20,7 @@
 #
 # Default
 
-CFLAGS_SYS= -O
+#CFLAGS_SYS= -O
 
 # For GNU C
 #
@@ -60,12 +60,12 @@
 # (if the include and lib directory do not match your installation,
 # modify them), also uncomment LIBS_FT
 #
-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
+CFLAGS_FT = -DUSE_FREETYPE `${FREETYPE_CONFIG} --cflags` -I/usr/local/include
 
 # 
 # The FreeType-2 library flags (disabled by default)
 
-LIBS_FT=
+LIBS_FT= `${FREETYPE_CONFIG} --libs`
 
 # To enable use of the FreeType-2 library
 # (if the include and lib directory do not match your installation,
@@ -114,17 +114,17 @@
 CFLAGS_EXTT1ASM=
 #CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
 
-CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF)
+CFLAGS+= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF)
 LIBS= $(LIBS_SYS) $(LIBS_FT) $(LIBS_AT)
 
 # Installation-related stuff
 # 
 # The base dir for installation and subdirs in it
-INSTDIR = /usr/local
+INSTDIR = ${PREFIX}
 # for binaries
 BINDIR = $(INSTDIR)/bin
 # for binaries of little general interest
-LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
+LIBXDIR = $(INSTDIR)/bin
 # for scripts, maps/encodings etc.
 SHAREDIR = $(INSTDIR)/share/ttf2pt1
 MANDIR = $(INSTDIR)/man
@@ -142,7 +142,7 @@
 	@echo >&2
 
 DOCS=CHANGES README FONTS FONTS.hpux encodings/README other/README \
-	app/X11/README app/netscape/README app/TeX/README
+	app/X11/README app/netscape/README
 
 SUBDIRS = app encodings maps scripts other
 TXTFILES = README* FONTS* CHANGES* COPYRIGHT