$OpenBSD: patch-Imakefile,v 1.3 2007/12/05 14:22:08 ajacoutot Exp $
--- Imakefile.orig	Sat Sep 28 19:46:02 1991
+++ Imakefile	Wed Dec  5 15:19:46 2007
@@ -1,6 +1,6 @@
-/**/# Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile.
-/**/# This is an R5 style Imakefile, so will need the R5 config files to
-/**/# to make a Makefile.  It also assume that X11 is installed in /usr/lib.
+XCOMM Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile.
+XCOMM This is an R5 style Imakefile, so will need the R5 config files to
+XCOMM to make a Makefile.  It also assume that X11 is installed in /usr/lib.
 
         SHAR = shar
         COMPRESS = compress
@@ -8,7 +8,7 @@
         SPLIT = split
         CAT = cat
 /***** Note: probably want to define this to be something else *****/
-        HELPDIR = help
+        HELPDIR = UsrLibDir/X11/spider
 
 /***** Note:  Used to over-ride some declarations in the default Imakefile
               configurations.  If you want to use some of these things, then
@@ -16,7 +16,7 @@
               definitions to what you would like them to be below.  Delete
               or comment out those you do not wish to use  *****/
 #ifndef OverrideDefs
-#define OverrideDefs YES
+#define OverrideDefs NO
 #endif
 
 #if OverrideDefs
@@ -94,8 +94,8 @@
 #endif
 
 #if CompileXView
-/**/# If these are not defined in the site.def file, define them now.
-/**/# set up compile time dependencies for XView clients.
+XCOMM If these are not defined in the site.def file, define them now.
+XCOMM set up compile time dependencies for XView clients.
         XVTOP = $(XVIEWHOME)
         XVLIBSRC = $(XVTOP)/lib
 # if UseInstalled
@@ -235,7 +235,7 @@ DEFINES = $(TKDEFINES) -DHELPDIR="\"$(HELPDIR)\"" $(UT
 # endif
 #endif
 
-INCLUDES = -I. $(TKINCLUDES)
+INCLUDES = -I. -I${X11BASE}/include $(TKINCLUDES)
 
 CPPFLAGS =