pango-arch_confdir.patch

   1 diff -uNr pango-1.30.1/modules/Makefile.am pango-1.30.1.new/modules/Makefile.am
   2 --- pango-1.30.1/modules/Makefile.am    2011-08-16 03:11:08.000000000 +0200
   3 +++ pango-1.30.1.new/modules/Makefile.am        2012-06-11 16:30:03.042700937 +0200
   4 @@ -28,15 +28,15 @@
   5
   6  install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
   7         @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then    \
   8 -         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\&      \
   9 +         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\&    \
  10           $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
  11 -               \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;        \
  12 -         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango &&             \
  13 +               \> $(DESTDIR)$(sysconfdir)/pango.modules ;      \
  14 +         $(mkinstalldirs) $(DESTDIR)$(sysconfdir) &&           \
  15           $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
  16 -               > $(DESTDIR)$(sysconfdir)/pango/pango.modules ;         \
  17 +               > $(DESTDIR)$(sysconfdir)/pango.modules ;               \
  18         else                                                            \
  19           echo "***" ;                                                  \
  20 -         echo "*** Warning: $(sysconfdir)/pango/pango.modules" ;       \
  21 +         echo "*** Warning: $(sysconfdir)/pango.modules" ;     \
  22           echo "*** not created" ;                                      \
  23           echo "*** Generate this file on the target system" ;          \
  24           echo "*** using pango-querymodules" ;                         \
  25 @@ -44,7 +44,7 @@
  26         fi
  27
  28  uninstall-local:
  29 -       $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
  30 +       $(RM) $(DESTDIR)$(sysconfdir)/pango.modules
  31
  32  pango.modules:                                         \
  33         $(SUBDIRS)                                      \
  34 diff -uNr pango-1.30.1/pango/pango-utils.c pango-1.30.1.new/pango/pango-utils.c
  35 --- pango-1.30.1/pango/pango-utils.c    2012-06-02 04:43:05.000000000 +0200
  36 +++ pango-1.30.1.new/pango/pango-utils.c        2012-06-11 16:30:03.046034427 +0200
  37 @@ -740,7 +740,7 @@
  38        if (sysconfdir != NULL)
  39         tpm_result = g_build_filename (sysconfdir, "pango", NULL);
  40        else
  41 -       tmp_result = SYSCONFDIR "/pango";
  42 +       tmp_result = SYSCONFDIR;
  43  #endif
  44      }
  45    return result;