$NetBSD: patch-aa,v 1.11 2005/04/14 01:41:27 dmcmahill Exp $

--- Imakefile.orig	2003-03-08 09:55:18.000000000 -0500
+++ Imakefile
@@ -9,7 +9,7 @@ XCOMM For color pixmaps, define MULTIPLA
 XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
 #define GRAY_BLKWHT_STIPPLES
 XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-#undef ARROW_SCROLLBARS
+#define ARROW_SCROLLBARS
 
 #define DoNormalLib NormalLibXaw
 #define DoSharedLib SharedLibXaw
@@ -18,11 +18,23 @@ XCOMM For scrollbars with arrows, define
 #define HasSharedData YES
 #define LibName Xaw3d
 #define SoRev SOXAWREV
+#ifdef SunArchitecture
+#  ifdef XISOPENWIN
+#    define IncSubdir Xaw3d
+#  else
+#    define IncSubdir X11/Xaw3d
+#  endif
+#else
+#ifdef SGIArchitecture
+#define IncSubdir Xaw3d
+#else
 #define IncSubdir X11
 #define IncSubSubdir Xaw3d
+#endif
+#endif
 
 XCOMM When building outside an X11 source tree:
-XCOMM EXTRA_INCLUDES = -I.
+EXTRA_INCLUDES = -I.
 
 #ifdef SharedXawReqs
 REQUIREDLIBS = SharedXawReqs