1 diff -urN pango-1.16.0/configure.in pango-1.16.0.new/configure.in
2 --- pango-1.16.0/configure.in 2007-02-26 20:13:10.000000000 +0100
3 +++ pango-1.16.0.new/configure.in 2007-03-10 14:33:28.000000000 +0100
6 AM_CONDITIONAL(HAVE_WIN32, $have_win32)
10 +AC_DEFINE_UNQUOTED(ARCH, "${ARCH}", [Architecture])
12 # Ensure MSVC-compatible struct packing convention is used when
13 # compiling for Win32 with gcc.
14 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
15 diff -urN pango-1.16.0/modules/Makefile.am pango-1.16.0.new/modules/Makefile.am
16 --- pango-1.16.0/modules/Makefile.am 2007-01-03 09:15:03.000000000 +0100
17 +++ pango-1.16.0.new/modules/Makefile.am 2007-03-10 14:35:45.000000000 +0100
20 install-data-local: $(top_builddir)/pango/pango-querymodules
21 @if $(RUN_QUERY_MODULES_TEST) ; then \
22 - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
23 + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\& \
24 $(top_builddir)/pango/pango-querymodules \
25 - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
26 - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
27 + \> $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \
28 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) && \
29 $(top_builddir)/pango/pango-querymodules \
30 - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
31 + > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \
34 - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
35 + echo "*** Warning: $(sysconfdir)/pango-$(ARCH)/pango.modules" ; \
36 echo "*** not created" ; \
37 echo "*** Generate this file on the target system" ; \
38 echo "*** using pango-querymodules" ; \
43 - $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
44 + $(RM) $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules
48 diff -urN pango-1.16.0/pango/Makefile.am pango-1.16.0.new/pango/Makefile.am
49 --- pango-1.16.0/pango/Makefile.am 2007-02-18 18:10:43.000000000 +0100
50 +++ pango-1.16.0.new/pango/Makefile.am 2007-03-10 14:53:50.000000000 +0100
53 pangoinclude_HEADERS += pangox.h
54 lib_LTLIBRARIES += libpangox-1.0.la
55 -aliasdir = $(sysconfdir)/pango
56 +aliasdir = $(sysconfdir)/pango-$(ARCH)
57 alias_DATA = pangox.aliases
60 diff -urN pango-1.16.0/pango/pango-utils.c pango-1.16.0.new/pango/pango-utils.c
61 --- pango-1.16.0/pango/pango-utils.c 2007-01-23 00:41:43.000000000 +0100
62 +++ pango-1.16.0.new/pango/pango-utils.c 2007-03-10 14:37:03.000000000 +0100
67 - return SYSCONFDIR "/pango";
68 + return SYSCONFDIR "/pango-" ARCH;
72 diff -urN pango-1.16.0/pango/pangox-fontmap.c pango-1.16.0.new/pango/pangox-fontmap.c
73 --- pango-1.16.0/pango/pangox-fontmap.c 2007-01-23 00:41:43.000000000 +0100
74 +++ pango-1.16.0.new/pango/pangox-fontmap.c 2007-03-10 14:38:04.000000000 +0100
79 - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
80 + files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango-" ARCH "/pangox.aliases");
82 files = pango_split_file_list (files_str);