$NetBSD: patch-aa,v 1.4 2009/07/08 17:03:51 joerg Exp $

--- Makefile.orig	2002-08-30 18:03:07.000000000 +0000
+++ Makefile
@@ -20,7 +20,7 @@
 #
 # Default
 
-CFLAGS_SYS= -O
+#CFLAGS_SYS= -O
 
 # For GNU C
 #
@@ -54,7 +54,7 @@ LIBS_SYS= -lm
 # This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.4
 # http://download.sourceforge.net/freetype/freetype-2.0.4.tar.gz
 
-CFLAGS_FT= 
+CFLAGS_FT= -DUSE_FREETYPE `freetype-config --cflags`
 
 # To enable use of the FreeType-2 library
 # (if the include and lib directory do not match your installation,
@@ -65,7 +65,7 @@ CFLAGS_FT= 
 # 
 # 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,
@@ -111,20 +111,20 @@ CFLAGS_PREF=
 #CFLAGS_PREF= -DPREFER_FREETYPE
 
 # Uncomment the second line to not compile t1asm into ttf2pt1
-CFLAGS_EXTT1ASM=
-#CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
+#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
@@ -145,12 +145,12 @@ DOCS=CHANGES README FONTS FONTS.hpux enc
 	app/X11/README app/netscape/README app/TeX/README
 
 SUBDIRS = app encodings maps scripts other
-TXTFILES = README* FONTS* CHANGES* COPYRIGHT
+TXTFILES = README README.html FONTS* CHANGES* COPYRIGHT
 
 MANS1=ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
 MANS=$(MANS1) $(MANS5)
 
-all:	t1asm ttf2pt1 docs mans rpm
+all:	ttf2pt1 docs mans
 
 docs: $(DOCS)
 
@@ -203,7 +203,7 @@ runt1asm.o: runt1asm.c global.h
 	$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
 
 ttf2pt1:	ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
-	$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
+	$(CC) $(LDFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
 
 CHANGES: CHANGES.html
 	scripts/unhtml <CHANGES.html >CHANGES
@@ -233,31 +233,21 @@ FONTS.hpux: FONTS.hpux.html
 	scripts/unhtml <FONTS.hpux.html >FONTS.hpux
 
 install: all
-	scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755
-	scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755
-	scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755
-	scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
-	scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
-	cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
-	chown -R $(OWNER) $(SHAREDIR)
-	chgrp -R $(GROUP) $(SHAREDIR)
-	chmod -R go-w $(SHAREDIR)
-	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
-	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(SHAREDIR)
+	cp -Rf $(TXTFILES) $(SUBDIRS) ${DESTDIR}$(SHAREDIR)
+	$(BSD_INSTALL_PROGRAM) ttf2pt1 ${DESTDIR}$(BINDIR)
 	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
 		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
 		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
-	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
-	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
-	rm cvt.tmp
-	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+	$(BSD_INSTALL_SCRIPT) cvt.tmp ${DESTDIR}$(BINDIR)/ttf2pt1_convert
+	rm -f cvt.tmp
+	$(BSD_INSTALL_SCRIPT) scripts/x2gs ${DESTDIR}$(BINDIR)/ttf2pt1_x2gs
 	for i in $(MANS1); do { \
 		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
 			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
-		&& chown $(OWNER) $(MANDIR)/man1/$$i \
-		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
-		&& chmod 0644 $(MANDIR)/man1/$$i \
+			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$$i.tmp \
+		&& $(BSD_INSTALL_MAN) $$i.tmp ${DESTDIR}$(MANDIR)/man1/$$i \
+		&& rm -f $$i.tmp \
 		|| exit 1; \
 	} done