--- Imakefile.orig	Tue Oct 15 16:41:19 1996
+++ Imakefile	Sat Apr  8 16:37:33 2000
@@ -6,7 +6,11 @@
 #define DoProfileLib ProfileLibXaw 
 #define HasSharedData YES
 #define LibName Xaw3d
+#if XFree86Version < 4000
 #define SoRev SOXAWREV
+#else
+#define SoRev SOXAW6REV
+#endif
 #define IncSubdir X11
 #define IncSubSubdir Xaw3d
 
@@ -39,9 +43,9 @@
 
        LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
 
-#  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
+EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
 
-#  EXTRA_INCLUDES = -I.
+EXTRA_INCLUDES = -I.
 
 HEADERS = \
 	AllWidgets.h \
@@ -222,6 +226,12 @@
 #endif
 #ifdef YaccCmd
 YACC=YaccCmd
+#endif
+
+/* gcc 2.8.1 bug workaround */
+#ifdef AlphaArchitecture
+    CXXDEBUGFLAGS = -O0
+      CDEBUGFLAGS = -O0
 #endif
 
 all::