]>
Commit | Line | Data |
---|---|---|
733aa93c | 1 | This patch by Branden Robinson. |
2 | ||
3 | --- XFree86-4.1.0/xc/lib/Xft/Imakefile~ Fri Apr 27 14:55:22 2001 | |
4 | +++ XFree86-4.1.0/xc/lib/Xft/Imakefile Mon Jun 4 01:20:55 2001 | |
5 | @@ -22,8 +22,7 @@ | |
6 | #define XftType1Dir $(LIBDIR)/fonts/Type1 | |
7 | #endif | |
8 | ||
9 | -XFTLIBDIR=XftLibDir | |
10 | -XFTCONFIG=$(XFTLIBDIR)/XftConfig | |
11 | +XFTCONFIG=$(CONFDIR)/XftConfig | |
12 | ||
13 | TYPE1DIR=XftType1Dir | |
14 | CONFIG_DEFS=-DXFT_TYPE1_DIR=\"$(TYPE1DIR)\" | |
15 | @@ -68,9 +67,9 @@ | |
16 | CppFileTarget(XftConfig,XftConfig.cpp,$(CONFIG_DEFS),$(ICONFIGFILES)) | |
17 | ||
18 | #if InstallFSConfig | |
19 | -InstallNonExecFile(XftConfig,$(XFTLIBDIR)) | |
20 | +InstallNonExecFile(XftConfig,$(CONFDIR)) | |
21 | #else | |
22 | -InstallNonExecFileNoClobber(XftConfig,$(XFTLIBDIR)) | |
23 | +InstallNonExecFileNoClobber(XftConfig,$(CONFDIR)) | |
24 | #endif | |
25 | ||
26 | LinkConfFileLong(XftConfig,XftConfig,$(XFTLIBDIR),$(CONFDIR)) |