diff -ur xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
--- xc.org/config/cf/X11.tmpl	2003-02-26 06:57:52.000000000 +0900
+++ xc/config/cf/X11.tmpl	2004-09-16 19:19:46.000000000 +0900
@@ -1582,9 +1582,9 @@
         MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir
        XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
 # elif UseInstalledOnCrossCompile
-        MKFONTDIR = $(BINDIR)/mkfontdir
-            FONTC = $(BINDIR)/bdftopcf
-       XCURSORGEN = $(BINDIR)/xcursorgen
+        MKFONTDIR = /usr/X11R6/bin/mkfontdir
+            FONTC = /usr/X11R6/bin/bdftopcf
+       XCURSORGEN = /usr/X11R6/bin/xcursorgen
 # endif
 # if HasPerl
       MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
diff -ur xc.org/config/cf/cross.def xc/config/cf/cross.def
--- xc.org/config/cf/cross.def	2002-04-04 23:05:33.000000000 +0900
+++ xc/config/cf/cross.def	2004-09-16 19:19:46.000000000 +0900
@@ -5,7 +5,7 @@
  * compiler images.  It will have to be edited to reflect these
  * given your local configuration.
  */
-#if 0
+#if 1
 #undef i386Architecture
 #define Arm32Architecture
 
@@ -14,18 +14,18 @@
 #define ServerCDebugFlags	-O2
 #undef StandardDefines
 #define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
+				-D_BSD_SOURCE -D_GNU_SOURCE
 #undef CcCmd
-#define StdIncDir /skiff/local/arm-linux/include
+#define StdIncDir $(TOPDIR)/tmp/cross/arm-linux/include
 #define PreIncDir 
 #undef PostIncDir
-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /skiff/local/bin/arm-linux-gcc
+#define PostIncDir $(TOPDIR)/tmp/cross/lib/gcc-lib/arm-linux/2.95.2/include
+#define CcCmd $(TOPDIR)/tmp/cross/bin/arm-linux-gcc
 #undef CplusplusCmd
 #define HasCplusplus YES
-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
+#define CplusplusCmd $(TOPDIR)/tmp/cross/bin/arm-linux-g++
 #define DoRanlibCmd YES
-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
+#define RanlibCmd $(TOPDIR)/tmp/cross/bin/arm-linux-ranlib
 #undef ExtraLoadFlags
 #define ExtraLoadFlags
 #define FbNoPixelAddrCode
@@ -33,7 +33,7 @@
 #define TermcapLibrary -ltermcap
 
 #undef LdPostLib
-#define LdPostLib	-L/skiff/local/arm-linux/lib
+#define LdPostLib	-L$(TOPDIR)/tmp/cross/arm-linux/lib
 
 #undef ExtensionOSDefines
 #define ExtensionOSDefines