--- programs/Xserver/hw/darwin/Imakefile.orig	Sun Mar 16 21:26:19 2003
+++ programs/Xserver/hw/darwin/Imakefile	Sun Mar 16 23:13:46 2003
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/Imakefile,v 1.15 2002/10/12 00:32:43 torrey Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/darwin/Imakefile,v 1.15.2.2 2003/03/04 02:48:04 torrey Exp $
 
 #include <Server.tmpl>
 #define IHaveSubdirs
@@ -19,7 +19,8 @@
 
 INCLUDES = -I. -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb -I$(EXTINCSRC) \
            -I$(SERVERSRC)/render -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-           -I$(SERVERSRC)/os -I$(INCLUDESRC) -I$(FONTINCSRC)
+           -I$(SERVERSRC)/os -I$(INCLUDESRC) -I$(FONTINCSRC) \
+           -I$(SERVERSRC)/hw/xfree86
 
 OSNAME = OSName
 OSVENDOR = OSVendor
@@ -33,6 +34,10 @@
 BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
 #endif
 
+#if OSMajorVersion >= 6
+CLUTDEF = -DUSE_NEW_CLUT
+#endif
+
 #if DarwinQuartzSupport
 # if HasNSCarbonWindow
 SUBDIRS = bundle quartz utils
@@ -47,7 +52,8 @@
 DEFINES = $(QUARTZDEF)
 EXTRAMANDEFS = $(QUARTZDEF) -D__logdir__=$(LOGDIRECTORY)
 
-SpecialCObjectRule(darwin,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(CUSTOMVERDEF))
+SpecialCObjectRule(darwin,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) \
+                   $(CUSTOMVERDEF) $(CLUTDEF))
 
 NormalLibraryObjectRule()
 NormalLibraryTarget(darwin,$(OBJS))
