$OpenBSD: patch-Makefile,v 1.2 2002/07/20 19:45:56 naddy Exp $
--- Makefile.orig	Thu Feb  4 01:43:27 1999
+++ Makefile	Sat Jul 20 18:47:42 2002
@@ -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 book contrib
 
 # some common definitions
 #
@@ -55,7 +55,7 @@ AR    = ar cq 
 RANLIB= ranlib
 
 SHELL     = /bin/sh
-MAKE      = make 
+#MAKE      = make 
 # change this to makedepend if your system doesn't have gcc
 MAKEDEPEND= gccmakedep
 
@@ -64,9 +64,9 @@ MAKEDEPEND= gccmakedep
 # Compiler Settings #
 #                   #
 #####################
-CC       = gcc
-CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
-LDFLAGS  = 
+#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.
@@ -115,7 +115,7 @@ IMAGEDEFINES = -DHAVE_LIBJPEG -DHAVE_LIB
 # HAVE_LIBZ => zlib.h
 
 ZLIBINC       =
-IMAGEINCLUDES = $(ZLIBINC)
+IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC) -I${LOCALBASE}/include/libpng
 
 # Image libraries
 # No need to add -lXpm if you need to include it with LIBS below
@@ -126,7 +126,7 @@ IMAGEINCLUDES = $(ZLIBINC)
 # HAVE_LIBZ => libz (and possibly libm)
 
 ZLIBLIB   = -lz -lm
-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
+IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB)
 
 # It might be troublesome to know what the correct defines are for your
 # system. A possible set of defines for some OS's is given below. Pick
@@ -166,14 +166,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${LOCALBASE}/include -I/usr/X11R6/include
 else
 ifeq ($(PLATFORM),gtk)
 PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -192,7 +192,7 @@ INCLUDES = $(LIBINC) $(PLATFORMINC) $(IM
 # Motif version (default)
 ifeq ($(PLATFORM),Motif)
 
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${LOCALBASE}/lib -L/usr/X11R6/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
@@ -200,12 +200,13 @@ LIBS   = -lXm -lXpm -lXmu -lXt -lXext -l
 else
 
 # gtk version (only supported port for now)
-ifeq($(PLATFORM),gtk)
+ifeq ($(PLATFORM),gtk)
 
 LIBDIR = -L/usr/local/lib
 LIBS   = -lgdk -lgtk -lX11
 
 # endif gtk
+endif
 endif
 
 # Uncomment if you're building libXmHTML with dmalloc support