From 925b68a7b26823fdfa1cb25d3edc3545fc2175b1 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 12 Jun 2012 08:30:03 +0200
Subject: fontconfig mesa pixman git update 12 Juni 2012

---
 fontconfig/doc/Makefile.am           | 15 +++++++++------
 fontconfig/doc/fontconfig-devel.sgml |  2 +-
 fontconfig/doc/fontconfig-user.sgml  |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'fontconfig/doc')

diff --git a/fontconfig/doc/Makefile.am b/fontconfig/doc/Makefile.am
index e86abe9e3..2e7363cf6 100644
--- a/fontconfig/doc/Makefile.am
+++ b/fontconfig/doc/Makefile.am
@@ -82,9 +82,9 @@ DOC_FUNCS_FNCS =		\
 	fcstrset.fncs		\
 	fcvalue.fncs		\
 	$(NULL)
-SGML_FILES =				\
-	$(srcdir)/fontconfig-user.sgml	\
-	$(srcdir)/fontconfig-devel.sgml	\
+SGML_FILES =			\
+	fontconfig-user.sgml	\
+	fontconfig-devel.sgml	\
 	$(NULL)
 LOCAL_SGML_FILES =			\
 	local-fontconfig-user.sgml	\
@@ -156,7 +156,7 @@ if CROSS_COMPILING
 else
 .fncs.sgml:
 	$(AM_V_GEN) $(RM) $@; \
-	$(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
+	$(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$(srcdir)/$*.fncs' > $*.sgml
 endif
 .sgml.txt:
 	$(AM_V_GEN) $(RM) $@; \
@@ -198,13 +198,16 @@ $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
 	$(AM_V_GEN) $(RM) -r $@; \
 	$(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
 local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
-	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@;	\
+	[ ! -f $(builddir)/fontconfig-user.sgml ] && cp -a $(srcdir)/fontconfig-user.sgml $(builddir)/fontconfig-user.sgml || :
 local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
-	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@;	\
+	[ ! -f $(builddir)/fontconfig-devel.sgml ] && cp -a $(srcdir)/fontconfig-devel.sgml $(builddir)/fontconfig-devel.sgml || :
 #
 all-local: $(BUILT_DOCS) $(HTML_DIR)/*
 clean-local:
 	$(RM) -r $(HTML_DIR) devel-man
+	[ "x$(builddir)" != "x$(srcdir)" ] && $(RM) $(builddir)/fontconfig-user.sgml $(builddir)/fontconfig-devel.sgml || :
 else
 htmldoc_DATA += $(srcdir)/$(HTML_DIR)/*
 all-local:
diff --git a/fontconfig/doc/fontconfig-devel.sgml b/fontconfig/doc/fontconfig-devel.sgml
index ab390925d..79cceb1ec 100644
--- a/fontconfig/doc/fontconfig-devel.sgml
+++ b/fontconfig/doc/fontconfig-devel.sgml
@@ -164,7 +164,7 @@ convenience for the application's rendering mechanism.
     verticallayout FC_VERTICAL_LAYOUT     Bool    Use vertical layout
     autohint       FC_AUTOHINT            Bool    Use autohinter instead of
                                                   normal hinter
-    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data
+    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data (deprecated)
     file           FC_FILE                String  The filename holding the font
     index          FC_INDEX               Int     The index of the font within
                                                   the file
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml
index f29cfe09b..92d0db8bf 100644
--- a/fontconfig/doc/fontconfig-user.sgml
+++ b/fontconfig/doc/fontconfig-user.sgml
@@ -112,7 +112,7 @@ convenience for the applications' rendering mechanism.
   hintstyle       Int     Automatic hinting style
   verticallayout  Bool    Use vertical layout
   autohint        Bool    Use autohinter instead of normal hinter
-  globaladvance   Bool    Use font global advance data
+  globaladvance   Bool    Use font global advance data (deprecated)
   file            String  The filename holding the font
   index           Int     The index of the font within the file
   ftface          FT_Face Use the specified FreeType face object
-- 
cgit v1.2.3