diff -urN ttf2pt1-3.4.4.orig/ft.c ttf2pt1-3.4.4/ft.c --- ttf2pt1-3.4.4.orig/ft.c 2006-04-10 15:40:01.000000000 +0800 +++ ttf2pt1-3.4.4/ft.c 2006-04-10 15:32:33.000000000 +0800 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff -urN ttf2pt1-3.4.4.orig/Makefile ttf2pt1-3.4.4/Makefile --- ttf2pt1-3.4.4.orig/Makefile 2006-04-10 15:40:01.000000000 +0800 +++ ttf2pt1-3.4.4/Makefile 2006-04-10 15:37:33.000000000 +0800 @@ -60,18 +60,18 @@ # (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 -I/usr/include/freetype2 # # The FreeType-2 library flags (disabled by default) -LIBS_FT= +#LIBS_FT= # To enable use of the FreeType-2 library # (if the include and lib directory do not match your installation, # modify them), also uncomment CFLAGS_FT # -#LIBS_FT= -L/usr/local/lib -lfreetype +LIBS_FT= -L/usr/lib -lfreetype # # The flags for C compiler for the Autotrace library (disabled by default). @@ -104,34 +104,34 @@ # Preference of front-ends if multiple parsers match a file # (by default the build-in front-end takes preference over FreeType) -CFLAGS_PREF= +#CFLAGS_PREF= # To prefer FreeType (if enabled): # -#CFLAGS_PREF= -DPREFER_FREETYPE +CFLAGS_PREF= -DPREFER_FREETYPE # Uncomment the second line to not compile t1asm into ttf2pt1 CFLAGS_EXTT1ASM= #CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM -CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF) -LIBS= $(LIBS_SYS) $(LIBS_FT) $(LIBS_AT) +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 = /usr # for binaries BINDIR = $(INSTDIR)/bin # for binaries of little general interest -LIBXDIR = $(INSTDIR)/libexec/ttf2pt1 +LIBXDIR = $(INSTDIR)/lib/ttf2pt1 # for scripts, maps/encodings etc. SHAREDIR = $(INSTDIR)/share/ttf2pt1 -MANDIR = $(INSTDIR)/man +MANDIR = $(INSTDIR)/share/man # owner and group of installed files OWNER = root -GROUP = bin +GROUP = root # After you have configured the Makefile, comment out the following # definition: