pango-arch_confdir.patch

   1 diff -urN pango-1.16.2.orig/configure.in pango-1.16.2/configure.in
   2 --- pango-1.16.2.orig/configure.in      2007-04-12 23:54:04.149334562 +0200
   3 +++ pango-1.16.2/configure.in   2007-04-12 23:54:27.631054049 +0200
   4 @@ -282,6 +282,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  # 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.2.orig/modules/Makefile.am pango-1.16.2/modules/Makefile.am
  16 --- pango-1.16.2.orig/modules/Makefile.am       2007-04-12 23:54:05.089269961 +0200
  17 +++ pango-1.16.2/modules/Makefile.am    2007-04-12 23:57:47.497317696 +0200
  18 @@ -28,15 +28,15 @@
  19
  20  install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
  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$(EXEEXT)                     \
  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$(EXEEXT)                     \
  30 -               > $(DESTDIR)$(sysconfdir)/pango/pango.modules ;         \
  31 +               > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ;         \
  32         else                                                            \
  33           echo "***" ;                                                  \
  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" ;                         \
  39 @@ -44,7 +44,7 @@
  40         fi
  41
  42  uninstall-local:
  43 -       $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
  44 +       $(RM) $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules
  45
  46  pango.modules:                                         \
  47         $(SUBDIRS)                                      \
  48 diff -urN pango-1.16.2.orig/pango/Makefile.am pango-1.16.2/pango/Makefile.am
  49 --- pango-1.16.2.orig/pango/Makefile.am 2007-04-12 23:54:04.006011079 +0200
  50 +++ pango-1.16.2/pango/Makefile.am      2007-04-12 23:54:27.631054049 +0200
  51 @@ -158,7 +158,7 @@
  52  if HAVE_X
  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
  58  endif
  59
  60 diff -urN pango-1.16.2.orig/pango/pango-utils.c pango-1.16.2/pango/pango-utils.c
  61 --- pango-1.16.2.orig/pango/pango-utils.c       2007-04-12 23:54:03.899351741 +0200
  62 +++ pango-1.16.2/pango/pango-utils.c    2007-04-12 23:54:27.631054049 +0200
  63 @@ -690,7 +690,7 @@
  64
  65    return result;
  66  #else
  67 -  return SYSCONFDIR "/pango";
  68 +  return SYSCONFDIR "/pango-" ARCH;
  69  #endif
  70  }
  71
  72 diff -urN pango-1.16.2.orig/pango/pangox-fontmap.c pango-1.16.2/pango/pangox-fontmap.c
  73 --- pango-1.16.2.orig/pango/pangox-fontmap.c    2007-04-12 23:54:04.026009703 +0200
  74 +++ pango-1.16.2/pango/pangox-fontmap.c 2007-04-12 23:54:27.634387153 +0200
  75 @@ -921,7 +921,7 @@
  76    int n;
  77
  78    if (!files_str)
  79 -    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
  80 +    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango-" ARCH "/pangox.aliases");
  81
  82    files = pango_split_file_list (files_str);
  83