blob: 25df71168129115a5f6202ea7ee933cb3197efc5 (
plain)
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
|
? configurable-encodingsdir.patch
Index: Makefile.am
===================================================================
RCS file: /cvs/xorg/font/encodings/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- Makefile.am 6 Oct 2005 23:16:10 -0000 1.2
+++ Makefile.am 8 Dec 2005 20:05:50 -0000
@@ -1,6 +1,6 @@
SUBDIRS = large
-encodingsdir = $(libdir)/X11/fonts/encodings
+encodingsdir = @ENCODINGSDIR@
ENCODING_FILES = \
adobe-dingbats.enc \
Index: configure.ac
===================================================================
RCS file: /cvs/xorg/font/encodings/configure.ac,v
retrieving revision 1.3
diff -u -b -B -r1.3 configure.ac
--- configure.ac 19 Oct 2005 02:48:07 -0000 1.3
+++ configure.ac 8 Dec 2005 20:05:50 -0000
@@ -18,6 +18,13 @@
AC_MSG_ERROR([gzip is needed to compress font encodings])
fi
+DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
+AC_ARG_WITH(encodingsdir,
+ AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
+ [ENCODINGSDIR="$withval"],
+ [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
+AC_SUBST(ENCODINGSDIR)
+
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile large/Makefile])
Index: large/Makefile.am
===================================================================
RCS file: /cvs/xorg/font/encodings/large/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- large/Makefile.am 6 Oct 2005 23:16:10 -0000 1.2
+++ large/Makefile.am 8 Dec 2005 20:05:50 -0000
@@ -1,4 +1,4 @@
-encodingsdir = $(libdir)/X11/fonts/encodings/large
+encodingsdir = @ENCODINGSDIR@/large
ENCODING_FILES = \
big5.eten-0.enc \
|
GitWeb
