--- xorg-cf-files-1.0.1/linux.cf.orig	2006-03-04 18:40:43.000000000 +0000
+++ xorg-cf-files-1.0.1/linux.cf	2006-03-04 18:41:48.000000000 +0000
@@ -193,6 +193,13 @@
 #define FSUseSyslog		YES
 #endif
 
+#define FSUseSyslog		YES
+#define BuildRman		NO
+#define BuildHtmlManPages	NO
+#define ProjectRoot		/usr
+#define ManPath			/usr/share/man
+#define XappLoadDir		/usr/share/X11/app-defaults
+
 #ifndef HasDevRandom
 # define HasDevRandom YES
 # ifndef RandomDeviceName
--- xorg-cf-files-1.0.2/X11.tmpl.orig	2006-07-15 10:45:23.000000000 +0000
+++ xorg-cf-files-1.0.2/X11.tmpl	2006-07-15 10:46:19.000000000 +0000
@@ -1502,10 +1502,10 @@
 #define DocPdfDir $(DOCDIR)/PDF
 #endif
 #ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
+#define FontDir /usr/share/fonts
 #endif
 #ifndef FontEncDir
-#define FontEncDir $(LIBDIR)/fonts/encodings
+#define FontEncDir /usr/share/fonts/encodings
 #endif
 #ifndef AdmDir
 #define AdmDir /usr/adm