]>
Commit | Line | Data |
---|---|---|
e7f140bb | 1 | diff -Nur pango-1.10.2/configure.in pango-1.10.2.arch_confdir/configure.in |
2 | --- pango-1.10.2/configure.in 2005-11-29 05:28:16.000000000 +0000 | |
3 | +++ pango-1.10.2.arch_confdir/configure.in 2005-12-10 16:57:38.000000000 +0000 | |
4 | @@ -270,6 +270,10 @@ | |
5 | AC_SUBST(WIN32_LIBS) | |
6 | AM_CONDITIONAL(HAVE_WIN32, $have_win32) | |
7 | ||
8 | +ARCH=${CC%%-*} | |
9 | +AC_SUBST(ARCH) | |
10 | +AC_DEFINE_UNQUOTED(ARCH, "${ARCH}", [Architecture]) | |
11 | + | |
12 | # | |
13 | # Checks for Cairo | |
14 | # | |
15 | diff -Nur pango-1.10.2/examples/Makefile.am pango-1.10.2.arch_confdir/examples/Makefile.am | |
16 | --- pango-1.10.2/examples/Makefile.am 2005-11-15 09:03:51.000000000 +0000 | |
17 | +++ pango-1.10.2.arch_confdir/examples/Makefile.am 2005-12-10 16:57:38.000000000 +0000 | |
18 | @@ -1,6 +1,6 @@ | |
19 | ## Process this file with automake to create Makefile.in. | |
20 | ||
21 | -aliasdir = $(sysconfdir)/pango | |
22 | +aliasdir = $(sysconfdir)/pango-$(ARCH) | |
23 | ||
24 | INCLUDES = \ | |
25 | -DG_DISABLE_DEPRECATED \ | |
26 | diff -Nur pango-1.10.2/modules/Makefile.am pango-1.10.2.arch_confdir/modules/Makefile.am | |
27 | --- pango-1.10.2/modules/Makefile.am 2005-06-21 16:02:55.000000000 +0000 | |
28 | +++ pango-1.10.2.arch_confdir/modules/Makefile.am 2005-12-10 16:57:38.000000000 +0000 | |
29 | @@ -22,12 +22,12 @@ | |
30 | ||
31 | install-data-local: | |
32 | @if $(RUN_QUERY_IMMODULES_TEST) ; then \ | |
33 | - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ | |
34 | + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\& \ | |
35 | $(top_builddir)/pango/pango-querymodules \ | |
36 | - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
37 | - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ | |
38 | + \> $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \ | |
39 | + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) && \ | |
40 | $(top_builddir)/pango/pango-querymodules \ | |
41 | - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
42 | + > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \ | |
43 | else \ | |
44 | echo "***" ; \ | |
45 | echo "*** Warning: pango.modules not created" ; \ | |
46 | diff -Nur pango-1.10.2/pango/pango-utils.c pango-1.10.2.arch_confdir/pango/pango-utils.c | |
47 | --- pango-1.10.2/pango/pango-utils.c 2005-11-23 17:53:30.000000000 +0000 | |
48 | +++ pango-1.10.2.arch_confdir/pango/pango-utils.c 2005-12-10 16:57:38.000000000 +0000 | |
49 | @@ -672,7 +672,7 @@ | |
50 | ||
51 | return result; | |
52 | #else | |
53 | - return SYSCONFDIR "/pango"; | |
54 | + return SYSCONFDIR "/pango-" ARCH ; | |
55 | #endif | |
56 | } | |
57 | ||
58 | diff -Nur pango-1.10.2/pango/pangox-fontmap.c pango-1.10.2.arch_confdir/pango/pangox-fontmap.c | |
59 | --- pango-1.10.2/pango/pangox-fontmap.c 2005-07-22 19:05:45.000000000 +0000 | |
60 | +++ pango-1.10.2.arch_confdir/pango/pangox-fontmap.c 2005-12-10 16:58:49.000000000 +0000 | |
61 | @@ -30,6 +30,8 @@ | |
62 | /* For XExtSetCloseDisplay */ | |
63 | #include <X11/Xlibint.h> | |
64 | ||
65 | +#include "config.h" | |
66 | + | |
67 | #include "pango-engine-private.h" | |
68 | #include "pango-fontmap.h" | |
69 | #include "pango-utils.h" | |
70 | @@ -917,7 +919,7 @@ | |
71 | int n; | |
72 | ||
73 | if (!files_str) | |
74 | - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); | |
75 | + files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango-" ARCH "/pangox.aliases"); | |
76 | ||
77 | files = pango_split_file_list (files_str); | |
78 |