projects / packages / pango.git / blame
| Commit | Line | Data |
|---|---|---|
| 21d7bab8 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 | |
| 0cc3ed92 | 3 | @@ -28,15 +28,15 @@ |
| e7f140bb | 4 | |
| 212d44ad | 5 | install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) |
| 21d7bab8 | 6 | @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ |
| e7f140bb | 7 | - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ |
| 8288d7c0 | 8 | + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\& \ |
| 21d7bab8 | 9 | $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ |
| e7f140bb | 10 | - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ |
| 11 | - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ | |
| 8288d7c0 ER |
12 | + \> $(DESTDIR)$(sysconfdir)/pango.modules ; \ |
| 13 | + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) && \ | |
| 21d7bab8 | 14 | $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ |
| e7f140bb | 15 | - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ |
| 8288d7c0 | 16 | + > $(DESTDIR)$(sysconfdir)/pango.modules ; \ |
| e7f140bb | 17 | else \ |
| 18 | echo "***" ; \ | |
| 0cc3ed92 | 19 | - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ |
| 8288d7c0 | 20 | + echo "*** Warning: $(sysconfdir)/pango.modules" ; \ |
| 0cc3ed92 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 | |
| 8288d7c0 | 29 | + $(RM) $(DESTDIR)$(sysconfdir)/pango.modules |
| 0cc3ed92 MB |
30 | |
| 31 | pango.modules: \ | |
| 32 | $(SUBDIRS) \ | |
| 212d44ad | 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 | |
| 0cc3ed92 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 | |
| 8288d7c0 | 40 | +aliasdir = $(sysconfdir) |
| 0cc3ed92 MB |
41 | alias_DATA = pangox.aliases |
| 42 | endif | |
| 43 | ||
| 212d44ad | 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 | |
| 8a548634 AF |
46 | @@ -706,7 +706,7 @@ |
| 47 | if (sysconfdir != NULL) | |
| 48 | result = g_build_filename (sysconfdir, "pango", NULL); | |
| 49 | else | |
| 50 | - result = SYSCONFDIR "/pango"; | |
| 51 | + result = SYSCONFDIR; | |
| e7f140bb | 52 | #endif |
| 8a548634 AF |
53 | } |
| 54 | return result; | |
| 212d44ad | 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 | |
| 0cc3ed92 | 57 | @@ -921,7 +921,7 @@ |
| e7f140bb | 58 | int n; |
| 59 | ||
| 60 | if (!files_str) | |
| 61 | - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); | |
| 8288d7c0 | 62 | + files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases"); |
| e7f140bb | 63 | |
| 64 | files = pango_split_file_list (files_str); | |
| 0cc3ed92 | 65 |