Index: X11.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.rules,v
retrieving revision 1.2
diff -u -r1.2 X11.rules
--- X11.rules	23 Apr 2004 18:41:58 -0000	1.2
+++ X11.rules	21 Aug 2004 10:37:57 -0000
@@ -35,6 +35,14 @@
 # define ImportX11		NO
 #endif
 
+#if defined(X11ProjectRoot)
+# define XBinDir	$(XPROJECTROOT)/bin
+#elif defined(ProjectRoot) 
+# define XBinDir	$(PROJECTROOT)/bin
+#else
+# define XBinDir	$(BINDIR)
+#endif
+
 #ifdef X11ProjectRoot
 # define XUsrLibDirPath	$(USRLIBDIR):$(XPROJECTROOT)/lib
 #else
Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.28
diff -u -r1.28 X11.tmpl
--- X11.tmpl	19 Aug 2004 16:28:42 -0000	1.28
+++ X11.tmpl	21 Aug 2004 10:38:01 -0000
@@ -1650,6 +1650,7 @@
        LIBEXECDIR = LibexecDir
         MODULEDIR = ModuleDir
    TOP_X_INCLUDES = TopXInclude
+          XBINDIR = XBinDir		/* BINDIR for X11ProjectRoot */
 
        INSTSRCDIR = InstSrcDir		/* Installed source (kernel modules). */
 
@@ -1683,15 +1684,15 @@
      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
 
 #if UseInstalledX11
-              RGB = $(BINDIR)/rgb
-            FONTC = $(BINDIR)/bdftopcf
-      MKFONTSCALE = $(BINDIR)/mkfontscale
-        MKFONTDIR = $(BINDIR)/mkfontdir
-      MKHTMLINDEX = $(BINDIR)/mkhtmlindex
-          UCS2ANY = $(BINDIR)/ProgramTargetName(ucs2any)
-      BDFTRUNCATE = $(BINDIR)/bdftruncate
+              RGB = $(XBINDIR)/rgb
+            FONTC = $(XBINDIR)/bdftopcf
+      MKFONTSCALE = $(XBINDIR)/mkfontscale
+        MKFONTDIR = $(XBINDIR)/mkfontdir
+      MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
+          UCS2ANY = $(XBINDIR)/ProgramTargetName(ucs2any)
+      BDFTRUNCATE = $(XBINDIR)/bdftruncate
      UCSMAPPREFIX = $(FONTDIR)/util/map-
-       XCURSORGEN = $(BINDIR)/xcursorgen
+       XCURSORGEN = $(XBINDIR)/xcursorgen
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
 # if !CrossCompiling
@@ -1699,18 +1700,19 @@
       MKFONTSCALE = $(CLIENTENVSETUP) $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale
         MKFONTDIR = $(MKFONTSCALE) -b -s -l
        XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
+          UCS2ANY = $(XBUILDBINDIR)/ProgramTargetName(ucs2any)
 # elif UseInstalledOnCrossCompile
-        MKFONTDIR = $(BINDIR)/mkfontdir
-      MKFONTSCALE = $(BINDIR)/mkfontscale
-            FONTC = $(BINDIR)/bdftopcf
-       XCURSORGEN = $(BINDIR)/xcursorgen
+        MKFONTDIR = $(XBINDIR)/mkfontdir
+      MKFONTSCALE = $(XBINDIR)/mkfontscale
+            FONTC = $(XBINDIR)/bdftopcf
+       XCURSORGEN = $(XBINDIR)/xcursorgen
+          UCS2ANY = $(XBINDIR)/ucs2any
 # endif
 # if HasPerl
       MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
 # else
       MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
 # endif
-          UCS2ANY = $(XBUILDBINDIR)/ProgramTargetName(ucs2any)
       BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl
      UCSMAPPREFIX = $(FONTSRC)/util/map-
 #endif
@@ -3763,7 +3765,7 @@
 # endif
 
 # if defined(UseInstalled) || (CrossCompiling &&  UseInstalledOnCrossCompile)
-     XKBCOMPCMD = $(BINDIR)/XkbComp
+     XKBCOMPCMD = $(XBINDIR)/XkbComp
 # else
      XKBCOMPSRC = $(PROGRAMSRC)/XkbComp
 #  if CrossCompiling