SOURCES: pango-arch_confdir.patch - revised archdir patch so /etc/...

[glen]

Author: glen                         Date: Mon Jun 18 15:02:50 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- revised archdir patch so /etc/pango or /etc/pango64 is used

---- Files affected:
SOURCES:
   pango-arch_confdir.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/pango-arch_confdir.patch
diff -u SOURCES/pango-arch_confdir.patch:1.3 SOURCES/pango-arch_confdir.patch:1.4
--- SOURCES/pango-arch_confdir.patch:1.3	Fri Apr 13 00:02:47 2007
+++ SOURCES/pango-arch_confdir.patch	Mon Jun 18 17:02:44 2007
@@ -1,18 +1,3 @@
-diff -urN pango-1.16.2.orig/configure.in pango-1.16.2/configure.in
---- pango-1.16.2.orig/configure.in	2007-04-12 23:54:04.149334562 +0200
-+++ pango-1.16.2/configure.in	2007-04-12 23:54:27.631054049 +0200
-@@ -282,6 +282,10 @@
- AC_SUBST(WIN32_LIBS)
- AM_CONDITIONAL(HAVE_WIN32, $have_win32) 
- 
-+ARCH=${CC%%-*}
-+AC_SUBST(ARCH)
-+AC_DEFINE_UNQUOTED(ARCH, "${ARCH}", [Architecture])
-+
- # Ensure MSVC-compatible struct packing convention is used when
- # compiling for Win32 with gcc.
- # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
-diff -urN pango-1.16.2.orig/modules/Makefile.am pango-1.16.2/modules/Makefile.am
 --- pango-1.16.2.orig/modules/Makefile.am	2007-04-12 23:54:05.089269961 +0200
 +++ pango-1.16.2/modules/Makefile.am	2007-04-12 23:57:47.497317696 +0200
 @@ -28,15 +28,15 @@
@@ -20,19 +5,19 @@
  install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
  	@if $(RUN_QUERY_MODULES_TEST) ; then 				\
 -	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
-+	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\& 	\
++	  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) && 		\
++		\> $(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: $(sysconfdir)/pango/pango.modules" ; 	\
-+	  echo "*** Warning: $(sysconfdir)/pango-$(ARCH)/pango.modules" ; 	\
++	  echo "*** Warning: $(sysconfdir)/pango.modules" ; 	\
  	  echo "*** not created" ; 					\
  	  echo "*** Generate this file on the target system" ; 		\
  	  echo "*** using pango-querymodules" ; 			\
@@ -41,11 +26,10 @@
  
  uninstall-local:
 -	$(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
-+	$(RM) $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules
++	$(RM) $(DESTDIR)$(sysconfdir)/pango.modules
  
  pango.modules:						\
  	$(SUBDIRS)					\
-diff -urN pango-1.16.2.orig/pango/Makefile.am pango-1.16.2/pango/Makefile.am
 --- 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 @@
@@ -53,11 +37,10 @@
  pangoinclude_HEADERS += pangox.h
  lib_LTLIBRARIES += libpangox-1.0.la
 -aliasdir = $(sysconfdir)/pango
-+aliasdir = $(sysconfdir)/pango-$(ARCH)
++aliasdir = $(sysconfdir)
  alias_DATA = pangox.aliases
  endif
  
-diff -urN pango-1.16.2.orig/pango/pango-utils.c pango-1.16.2/pango/pango-utils.c
 --- 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 @@
@@ -65,11 +48,10 @@
    return result;
  #else
 -  return SYSCONFDIR "/pango";
-+  return SYSCONFDIR "/pango-" ARCH;
++  return SYSCONFDIR;
  #endif
  }
  
-diff -urN pango-1.16.2.orig/pango/pangox-fontmap.c pango-1.16.2/pango/pangox-fontmap.c
 --- 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 @@
@@ -77,7 +59,7 @@
  
    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);
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pango-arch_confdir.patch?r1=1.3&r2=1.4&f=u