$NetBSD: patch-aa,v 1.5 2002/12/16 23:02:33 grant Exp $

--- Makefile.orig	Thu Dec 12 00:24:51 2002
+++ Makefile
@@ -12,7 +12,7 @@
 ######## Covered by GPL; see the file ./Copyright for details. 
 
 # defaults..
-CC = gcc
+#CC = gcc
 PLATFORM = UNIX
 RMCOM = rm -f
 XOBJ = x11.o interact.o
@@ -25,12 +25,12 @@ PLPNG = plpng 
 ########         Choose one of the following.   All others should be commented out.
 
 #### For Solaris 2.x uncomment the following..
-XLIBS = -L/usr/openwin/lib -lX11
-XINCLUDEDIR = -I/usr/openwin/include
+#XLIBS = -L/usr/openwin/lib -lX11
+#XINCLUDEDIR = -I/usr/openwin/include
 
 #### For Linux and FreeBSD uncomment the following..
-# XLIBS = -L/usr/X11R6/lib -lX11
-# XINCLUDEDIR = -I/usr/X11R6/include
+XLIBS = -L${X11BASE}/lib -lX11
+XINCLUDEDIR = -I${X11BASE}/include
 #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
 # ADDLIBS = -L/usr/local/lib
 
@@ -79,7 +79,7 @@ XINCLUDEDIR = -I/usr/openwin/include
 ########         Choose ONE of the following.  All others should be commented out.
 
 #### For pseudo-GIF (only) uncomment the following..  (no libs required)
-ploticus: pl 
+#ploticus: pl 
 
 #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
 # ploticus: plpng 
@@ -104,11 +104,11 @@ ploticus: pl 
 #### For JPEG, WBMP, PNG, with FreeType2, using your copy of GD 1.84 or higher,
 ####  uncomment the following..   (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
 ####  (set environment var GDFONTPATH to directory containing .ttf files)
-# ploticus: plgd18 
-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
-# GD18H = 
-# GDFREETYPE = -DGDFREETYPE
-# ZFLAG = -DWZ
+ploticus: plgd18 
+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
+GD18H = 
+GDFREETYPE = -DGDFREETYPE
+ZFLAG = -DWZ
 
 #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
 # ploticus: plnogd 
@@ -126,7 +126,7 @@ ploticus: pl 
 #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
 #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
 #### This option not available for win32
-# PREFABS_DIR = "/usr/lib/ploticus"
+PREFABS_DIR = "${PREFIX}/share/ploticus"
 
 #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
 # LOCALEOBJ = localef.o
@@ -163,9 +163,9 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
 GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
 
 
-LIBS = $(XLIBS) -lm $(ADDLIBS) 
+LIBS = ${LDFLAGS} $(XLIBS) -lm $(ADDLIBS) 
 
-CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
+CFLAGS+= -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
   $(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
 
 OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \