-diff -Nur pango-1.10.2/configure.in pango-1.10.2.arch_confdir/configure.in
---- pango-1.10.2/configure.in 2005-11-29 05:28:16.000000000 +0000
-+++ pango-1.10.2.arch_confdir/configure.in 2005-12-10 16:57:38.000000000 +0000
-@@ -270,6 +270,10 @@
- AC_SUBST(WIN32_LIBS)
- AM_CONDITIONAL(HAVE_WIN32, $have_win32)
+--- pango-1.18.0/modules/Makefile.am.orig 2007-07-05 23:30:28.000000000 +0200
++++ pango-1.18.0/modules/Makefile.am 2007-08-26 20:39:17.982104313 +0200
+@@ -28,15 +28,15 @@
-+ARCH=${CC%%-*}
-+AC_SUBST(ARCH)
-+AC_DEFINE_UNQUOTED(ARCH, "${ARCH}", [Architecture])
-+
- #
- # Checks for Cairo
- #
-diff -Nur pango-1.10.2/examples/Makefile.am pango-1.10.2.arch_confdir/examples/Makefile.am
---- pango-1.10.2/examples/Makefile.am 2005-11-15 09:03:51.000000000 +0000
-+++ pango-1.10.2.arch_confdir/examples/Makefile.am 2005-12-10 16:57:38.000000000 +0000
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
-
--aliasdir = $(sysconfdir)/pango
-+aliasdir = $(sysconfdir)/pango-$(ARCH)
-
- INCLUDES = \
- -DG_DISABLE_DEPRECATED \
-diff -Nur pango-1.10.2/modules/Makefile.am pango-1.10.2.arch_confdir/modules/Makefile.am
---- pango-1.10.2/modules/Makefile.am 2005-06-21 16:02:55.000000000 +0000
-+++ pango-1.10.2.arch_confdir/modules/Makefile.am 2005-12-10 16:57:38.000000000 +0000
-@@ -22,12 +22,12 @@
-
- install-data-local:
- @if $(RUN_QUERY_IMMODULES_TEST) ; then \
+ install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
+ @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
-+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\& \
- $(top_builddir)/pango/pango-querymodules \
++ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\& \
+ $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
-+ \> $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) && \
- $(top_builddir)/pango/pango-querymodules \
++ \> $(DESTDIR)$(sysconfdir)/pango.modules ; \
++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) && \
+ $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
-+ > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \
++ > $(DESTDIR)$(sysconfdir)/pango.modules ; \
else \
echo "***" ; \
- echo "*** Warning: pango.modules not created" ; \
-diff -Nur pango-1.10.2/pango/pango-utils.c pango-1.10.2.arch_confdir/pango/pango-utils.c
---- pango-1.10.2/pango/pango-utils.c 2005-11-23 17:53:30.000000000 +0000
-+++ pango-1.10.2.arch_confdir/pango/pango-utils.c 2005-12-10 16:57:38.000000000 +0000
-@@ -672,7 +672,7 @@
+- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
++ echo "*** Warning: $(sysconfdir)/pango.modules" ; \
+ echo "*** not created" ; \
+ echo "*** Generate this file on the target system" ; \
+ echo "*** using pango-querymodules" ; \
+@@ -44,7 +44,7 @@
+ fi
+
+ uninstall-local:
+- $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
++ $(RM) $(DESTDIR)$(sysconfdir)/pango.modules
+
+ pango.modules: \
+ $(SUBDIRS) \
+--- pango-1.16.2.orig/pango/Makefile.am 2007-04-12 23:54:04.006011079 +0200
++++ pango-1.16.2/pango/Makefile.am 2007-04-12 23:54:27.631054049 +0200
+@@ -158,7 +158,7 @@
+ if HAVE_X
+ pangoinclude_HEADERS += pangox.h
+ lib_LTLIBRARIES += libpangox-1.0.la
+-aliasdir = $(sysconfdir)/pango
++aliasdir = $(sysconfdir)
+ alias_DATA = pangox.aliases
+ endif
+
+--- pango-1.16.2.orig/pango/pango-utils.c 2007-04-12 23:54:03.899351741 +0200
++++ pango-1.16.2/pango/pango-utils.c 2007-04-12 23:54:27.631054049 +0200
+@@ -690,7 +690,7 @@
return result;
#else
- return SYSCONFDIR "/pango";
-+ return SYSCONFDIR "/pango-" ARCH ;
++ return SYSCONFDIR;
#endif
}
-diff -Nur pango-1.10.2/pango/pangox-fontmap.c pango-1.10.2.arch_confdir/pango/pangox-fontmap.c
---- pango-1.10.2/pango/pangox-fontmap.c 2005-07-22 19:05:45.000000000 +0000
-+++ pango-1.10.2.arch_confdir/pango/pangox-fontmap.c 2005-12-10 16:58:49.000000000 +0000
-@@ -30,6 +30,8 @@
- /* For XExtSetCloseDisplay */
- #include <X11/Xlibint.h>
-
-+#include "config.h"
-+
- #include "pango-engine-private.h"
- #include "pango-fontmap.h"
- #include "pango-utils.h"
-@@ -917,7 +919,7 @@
+--- pango-1.16.2.orig/pango/pangox-fontmap.c 2007-04-12 23:54:04.026009703 +0200
++++ pango-1.16.2/pango/pangox-fontmap.c 2007-04-12 23:54:27.634387153 +0200
+@@ -921,7 +921,7 @@
int n;
if (!files_str)
- files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
-+ files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango-" ARCH "/pangox.aliases");
++ files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases");
files = pango_split_file_list (files_str);
-
+
projects / packages / crossmingw32-pango.git / blobdiff