1 --- xc.orig/config/cf/X11.tmpl 2004-08-08 14:31:29.000000000 +0200
2 +++ xc/config/cf/X11.tmpl 2004-08-08 14:48:48.483329416 +0200
5 #ifndef XFileSearchPathBase
6 /* avoid SCCS keyword */
7 -#define XFileSearchPathBase Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
8 +#define XFileSearchPathBase $(LIBDIR)/%T/%L/%N%C%S:$(LIBDIR)/%T/%l/%N%C%S:$(LIBDIR)/%T/C/%N%C%S:$(LIBDIR)/%T/POSIX/%N%C%S:$(LIBDIR)/%T/%N%C%S:$(LIBDIR)/%T/%L/%N%S:$(LIBDIR)/%T/%l/%N%S:$(LIBDIR)/%T/C/%N%S:$(LIBDIR)/%T/POSIX/%N%S:$(LIBDIR)/%T/%N%S:$(LIBDIR)/%L/%T/%N%C%S:$(LIBDIR)/%l/%T/%N%C%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S
10 #ifndef XFileSearchPathDefault
12 @@ -3888,11 +3888,9 @@
13 #if UseConfDirForAppDefaults
14 #if InstallAppDefFiles
15 #define InstallAppDefaultsLong(file,class) @@\
16 -LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
17 InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
19 #define InstallAppDefaultsLong(file,class) @@\
20 -LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
21 InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
22 #endif /* InstallAppDefFiles */
23 #else /* UseConfDirForAppDefaults */