$NetBSD: patch-aa,v 1.7 2005/07/31 05:51:28 grant Exp $

--- Makefile.orig	1999-02-04 11:43:27.000000000 +1100
+++ Makefile
@@ -40,7 +40,7 @@ PLATFORM=Motif
 # remove the examples directory from this line.
 # If you want to build the XmHTML tutorial examples, add the book directory.
 
-SUBDIRS= lib http examples tools
+SUBDIRS= lib # http examples tools
 
 # some common definitions
 #
@@ -64,9 +64,10 @@ MAKEDEPEND= gccmakedep
 # Compiler Settings #
 #                   #
 #####################
-CC       = gcc
-CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
-LDFLAGS  = 
+# Inherit from build environment
+#CC       = gcc
+#CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
+#LDFLAGS  = 
 
 # The following flags are *very* usefull if you are getting unresolved
 # references to functions in libraries that you *know* to exist.
@@ -114,8 +115,8 @@ IMAGEDEFINES = -DHAVE_LIBJPEG -DHAVE_LIB
 # HAVE_LIBPNG  => png.h and zlib.h
 # HAVE_LIBZ => zlib.h
 
-ZLIBINC       =
-IMAGEINCLUDES = $(ZLIBINC)
+ZLIBINC       = 
+IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
 
 # Image libraries
 # No need to add -lXpm if you need to include it with LIBS below
@@ -166,14 +167,14 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
 # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
 # info).
 #
-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
+CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES) 
 
 # Various include directories
 LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
 
 # Platform specific includes
 ifeq ($(PLATFORM),Motif)
-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
+PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
 else
 ifeq ($(PLATFORM),gtk)
 PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -192,17 +193,17 @@ INCLUDES = $(LIBINC) $(PLATFORMINC) $(IM
 # Motif version (default)
 ifeq ($(PLATFORM),Motif)
 
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${X11BASE}/lib
 # This is what is required under Linux (Motif 2.0.1).
 # Your mileage may vary.
-LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
+LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
 
 else
 
 # gtk version (only supported port for now)
 ifeq($(PLATFORM),gtk)
 
-LIBDIR = -L/usr/local/lib
+LIBDIR = -L${X11BASE}/lib
 LIBS   = -lgdk -lgtk -lX11
 
 # endif gtk