$NetBSD: patch-ac,v 1.3 2000/11/16 18:25:24 wiz Exp $

--- xgd-1.7.3/Makefile.in.orig	Tue Oct 10 21:16:16 2000
+++ xgd-1.7.3/Makefile.in
@@ -29,7 +29,7 @@
 
 #If you don't have FreeType and/or Xpm installed, including the
 #header files, uncomment this (default).
-CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
+CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ -I${LOCALBASE}/include
 #If you do have FreeType and/or Xpm fully installed, uncomment a
 #variation of this and comment out the line above. See also LIBS below.
 #CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF
@@ -45,7 +45,9 @@
 
 #Typical install locations for freetype, zlib, xpm and libpng header files.
 #If yours are somewhere else, change this. 
-INCLUDEDIRS=
+#Put -I. first so that old versions of the gd library elsewhere
+#on your system can't cause conflicts while building a new one.
+INCLUDEDIRS=-I.
 
 #Typical install locations for freetype, zlib, xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
@@ -80,18 +82,10 @@
 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
 
-all: libxgd.a $(PROGRAMS)
+all: libxgd.a
 
-install: libxgd.a $(BIN_PROGRAMS)
+install: libxgd.a
 	$(INSTALL) libxgd.a $(INSTALL_LIB)/libxgd.a
-	$(INSTALL) pngtogd $(INSTALL_BIN)/pngtogd
-	$(INSTALL) pngtogd2 $(INSTALL_BIN)/pngtogd2
-	$(INSTALL) gdtopng $(INSTALL_BIN)/gdtopng
-	$(INSTALL) gd2topng $(INSTALL_BIN)/gd2topng
-	$(INSTALL) gd2copypal $(INSTALL_BIN)/gd2copypal
-	$(INSTALL) gdparttopng $(INSTALL_BIN)/gdparttopng
-	$(INSTALL) webpng $(INSTALL_BIN)/webpng
-	$(INSTALL) bdftogd $(INSTALL_BIN)/bdftogd
 	$(INSTALL_DATA) gd.h $(INSTALL_INCLUDE)/gd.h
 	$(INSTALL_DATA) gdcache.h $(INSTALL_INCLUDE)/gdcache.h
 	$(INSTALL_DATA) gd_io.h $(INSTALL_INCLUDE)/gd_io.h