$NetBSD: patch-aa,v 1.3 2000/10/08 18:27:10 hubertf Exp $ --- Makefile.orig Thu Sep 28 16:46:34 2000 +++ Makefile @@ -24,7 +24,7 @@ ## and porting. -CC = gcc +#CC = gcc ADDLIBS = SLEEPLIB = @@ -32,15 +32,15 @@ ######## and comment out the others: ## For Solaris 2.x -PLATFORM = SOLARIS2 -XLIBDIR = /usr/openwin/lib -XINCLUDEDIR = /usr/openwin/include -SLEEPLIB = -lposix4 # for nanosleep() only +#PLATFORM = SOLARIS2 +#XLIBDIR = /usr/openwin/lib +#XINCLUDEDIR = /usr/openwin/include +#SLEEPLIB = -lposix4 # for nanosleep() only ## For Linux, FreeBSD -# PLATFORM = BSD -# XLIBDIR = /usr/X11R6/lib -# XINCLUDEDIR = /usr/X11R6/include +PLATFORM = BSD +XLIBDIR = ${X11BASE}/lib +XINCLUDEDIR = ${X11BASE}/include ## For AIX 3.2.5, HP-UX 10.20 # (note for HP-UX it was necessary to do: ln gd_io.h gd16 @@ -126,9 +126,9 @@ -LIBS = $(XLIBS) -lm $(ADDLIBS) +LIBS = ${LDFLAGS} ${XLIBS} -lm $(ADDLIBS) -CFLAGS = -D$(PLATFORM) -DPLOTICUS -DDIST $(XCFLAGS) $(FLAGS) $(LOCALE_FLAG) +CFLAGS+= -D${PLATFORM} -DPLOTICUS -DDIST ${XCFLAGS} ${FLAGS} ${LOCALE_FLAG} OBJ = custom.o execplfile.o lib.o areadef.o page.o axis.o getdata.o parsedata.o \ drawcommands.o annotate.o tabulate.o lineplot.o bars.o bevelrect.o units.o line.o \ @@ -168,7 +168,7 @@ gd16files: $(CC) -c grgd.c -DGDPNG -I./ -I./gd16 -o grgd16.o $(CC) -c devstuff.c -DGDPNG -o devstuff16.o - $(CC) -c -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c + $(CC) -c -I./gd16 -I./ -I${PREFIX}/include $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c install: mv pl pltab plpng pltabpng ../bin