1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
? configurable-aliasdir.patch
Index: configure.ac
===================================================================
RCS file: /cvs/xorg/font/alias/configure.ac,v
retrieving revision 1.2
diff -u -b -B -r1.2 configure.ac
--- configure.ac 29 Jul 2005 21:22:47 -0000 1.2
+++ configure.ac 8 Dec 2005 20:18:22 -0000
@@ -28,6 +28,13 @@
AC_PROG_INSTALL
+DEFAULT_ALIASDIR=${libdir}/X11/fonts
+AC_ARG_WITH(aliasdir,
+ AS_HELP_STRING([--with-top-fontdir=ALIASDIR], [Path to install font encodings]),
+ [ALIASDIR="$withval"],
+ [ALIASDIR="$DEFAULT_ALIASDIR"])
+AC_SUBST(ALIASDIR)
+
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
Index: 100dpi/Makefile.am
===================================================================
RCS file: /cvs/xorg/font/alias/100dpi/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- 100dpi/Makefile.am 12 Jul 2005 04:23:08 -0000 1.1
+++ 100dpi/Makefile.am 8 Dec 2005 20:18:22 -0000
@@ -19,7 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-aliasdir = $(libdir)/X11/fonts/100dpi
+aliasdir = @ALIASDIR@/100dpi
alias_DATA = fonts.alias
EXTRA_DIST = $(alias_DATA)
Index: 75dpi/Makefile.am
===================================================================
RCS file: /cvs/xorg/font/alias/75dpi/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- 75dpi/Makefile.am 12 Jul 2005 04:23:08 -0000 1.1
+++ 75dpi/Makefile.am 8 Dec 2005 20:18:22 -0000
@@ -19,7 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-aliasdir = $(libdir)/X11/fonts/75dpi
+aliasdir = @ALIASDIR@/75dpi
alias_DATA = fonts.alias
EXTRA_DIST = $(alias_DATA)
Index: cyrillic/Makefile.am
===================================================================
RCS file: /cvs/xorg/font/alias/cyrillic/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- cyrillic/Makefile.am 12 Jul 2005 04:23:08 -0000 1.1
+++ cyrillic/Makefile.am 8 Dec 2005 20:18:22 -0000
@@ -19,7 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-aliasdir = $(libdir)/X11/fonts/cyrillic
+aliasdir = @ALIASDIR@/cyrillic
alias_DATA = fonts.alias
EXTRA_DIST = $(alias_DATA)
Index: misc/Makefile.am
===================================================================
RCS file: /cvs/xorg/font/alias/misc/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- misc/Makefile.am 12 Jul 2005 04:23:08 -0000 1.1
+++ misc/Makefile.am 8 Dec 2005 20:18:22 -0000
@@ -19,7 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-aliasdir = $(libdir)/X11/fonts/misc
+aliasdir = @ALIASDIR@/misc
alias_DATA = fonts.alias
EXTRA_DIST = $(alias_DATA)
|
GitWeb