]>
Commit | Line | Data |
---|---|---|
bfc36f50 | 1 | --- XFree86-4.0/xc/config/cf/X11.tmpl Wed Jun 7 07:29:47 2000 |
2 | +++ XFree86-4.0/xc/config/cf/X11.tmpl Wed Jun 7 07:35:17 2000 | |
c1b01753 JR |
3 | @@ -1016,7 +1016,7 @@ |
4 | #endif | |
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) | |
5aede8d9 | 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 |
c1b01753 JR |
9 | #endif |
10 | #ifndef XFileSearchPathDefault | |
11 | #ifdef XAppLoadDir | |
bfc36f50 | 12 | @@ -2199,11 +2199,9 @@ |
13 | #ifndef InstallAppDefaultsLong | |
14 | #if InstallAppDefFiles | |
15 | #define InstallAppDefaultsLong(file,class) @@\ | |
16 | -LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ | |
17 | InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) | |
18 | #else | |
19 | #define InstallAppDefaultsLong(file,class) @@\ | |
20 | -LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ | |
21 | InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) | |
22 | #endif /* InstallAppDefFiles */ | |
23 | #endif /* InstallAppDefaultsLong */ |