]>
Commit | Line | Data |
---|---|---|
4c4012c6 JB |
1 | --- pango-1.18.0/modules/Makefile.am.orig 2007-07-05 23:30:28.000000000 +0200 |
2 | +++ pango-1.18.0/modules/Makefile.am 2007-08-26 20:39:17.982104313 +0200 | |
a62d6cc4 | 3 | @@ -28,15 +28,15 @@ |
09b257f5 | 4 | |
de349ab6 | 5 | install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) |
4c4012c6 | 6 | @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ |
09b257f5 | 7 | - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ |
75629e02 | 8 | + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\& \ |
4c4012c6 | 9 | $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ |
09b257f5 | 10 | - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ |
11 | - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ | |
75629e02 ER |
12 | + \> $(DESTDIR)$(sysconfdir)/pango.modules ; \ |
13 | + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) && \ | |
4c4012c6 | 14 | $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ |
09b257f5 | 15 | - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ |
75629e02 | 16 | + > $(DESTDIR)$(sysconfdir)/pango.modules ; \ |
09b257f5 | 17 | else \ |
18 | echo "***" ; \ | |
a62d6cc4 | 19 | - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ |
75629e02 | 20 | + echo "*** Warning: $(sysconfdir)/pango.modules" ; \ |
a62d6cc4 MB |
21 | echo "*** not created" ; \ |
22 | echo "*** Generate this file on the target system" ; \ | |
23 | echo "*** using pango-querymodules" ; \ | |
24 | @@ -44,7 +44,7 @@ | |
25 | fi | |
26 | ||
27 | uninstall-local: | |
28 | - $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules | |
75629e02 | 29 | + $(RM) $(DESTDIR)$(sysconfdir)/pango.modules |
a62d6cc4 MB |
30 | |
31 | pango.modules: \ | |
32 | $(SUBDIRS) \ | |
de349ab6 | 33 | --- pango-1.16.2.orig/pango/Makefile.am 2007-04-12 23:54:04.006011079 +0200 |
34 | +++ pango-1.16.2/pango/Makefile.am 2007-04-12 23:54:27.631054049 +0200 | |
a62d6cc4 MB |
35 | @@ -158,7 +158,7 @@ |
36 | if HAVE_X | |
37 | pangoinclude_HEADERS += pangox.h | |
38 | lib_LTLIBRARIES += libpangox-1.0.la | |
39 | -aliasdir = $(sysconfdir)/pango | |
75629e02 | 40 | +aliasdir = $(sysconfdir) |
a62d6cc4 MB |
41 | alias_DATA = pangox.aliases |
42 | endif | |
43 | ||
de349ab6 | 44 | --- pango-1.16.2.orig/pango/pango-utils.c 2007-04-12 23:54:03.899351741 +0200 |
45 | +++ pango-1.16.2/pango/pango-utils.c 2007-04-12 23:54:27.631054049 +0200 | |
a62d6cc4 | 46 | @@ -690,7 +690,7 @@ |
09b257f5 | 47 | |
48 | return result; | |
49 | #else | |
50 | - return SYSCONFDIR "/pango"; | |
75629e02 | 51 | + return SYSCONFDIR; |
09b257f5 | 52 | #endif |
53 | } | |
54 | ||
de349ab6 | 55 | --- pango-1.16.2.orig/pango/pangox-fontmap.c 2007-04-12 23:54:04.026009703 +0200 |
56 | +++ pango-1.16.2/pango/pangox-fontmap.c 2007-04-12 23:54:27.634387153 +0200 | |
a62d6cc4 | 57 | @@ -921,7 +921,7 @@ |
09b257f5 | 58 | int n; |
59 | ||
60 | if (!files_str) | |
61 | - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); | |
75629e02 | 62 | + files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases"); |
09b257f5 | 63 | |
64 | files = pango_split_file_list (files_str); | |
a62d6cc4 | 65 |