From b91444584a64f4f7b3eaeee05ef36ac53691fb24 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 12 Mar 2012 07:18:46 +0100
Subject: xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12
 Mar 2012

---
 fontconfig/doc/Makefile.am | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'fontconfig/doc')

diff --git a/fontconfig/doc/Makefile.am b/fontconfig/doc/Makefile.am
index 06ec5e9ea..f483bc757 100644
--- a/fontconfig/doc/Makefile.am
+++ b/fontconfig/doc/Makefile.am
@@ -143,7 +143,6 @@ htmldoc_DATA =		\
 if USEDOCBOOK
 BUILT_SOURCES +=		\
 	$(LOCAL_SGML_FILES)	\
-	func.refs		\
 	$(NULL)
 noinst_PROGRAMS +=	\
 	edit-sgml	\
@@ -156,48 +155,48 @@ if CROSS_COMPILING
 	@echo Warning: cannot rebuild $@ when cross-compiling
 else
 .fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml
-	-rm $@
-	$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$<' > $*.sgml
+	-@rm $@
+	$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
 endif
 .sgml.txt: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2TXT) $<
+	-@rm $@
+	$(AM_V_GEN) $(DOC2TXT) $*.sgml
 .sgml.pdf: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2PDF) $<
+	-@rm $@
+	$(AM_V_GEN) $(DOC2PDF) $*.sgml
 .sgml.html: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2HTML) -u $< > $@
+	-@rm $@
+	$(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@
 ##
 fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
-	-rm $@
-	$(AM_V_GEN) $(DOC2MAN) $< && \
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \
+	rm manpage.*
 ##
 $(man3_MANS): func.refs
 func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
-	-rm $@
+	-@rm $@
 	[ "x$(builddir)" != "x$(srcdir)" ] &&		\
 	for f in $(DOC_FUNCS_SGML); do			\
-		$(RM) $(builddir)/$$f || :;		\
+		rm -f $(builddir)/$$f || :;		\
 		$(LN_S) $(srcdir)/$$f $(builddir)/$$f;	\
 	done || :
 	$(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
 	mv devel-man/manpage.refs func.refs &&	\
 	mv devel-man/*.3 . &&			\
-	$(RM) devel-man/manpage.* &&		\
+	rm devel-man/manpage.* &&		\
 	rmdir devel-man
 confdir.sgml: $(srcdir)/confdir.sgml.in
-	$(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $< | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
+	$(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
 ##
 $(HTML_DIR)/*: $(HTML_DIR)
 $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
-	-rm -r $@
+	-@rm -r $@
 	$(AM_V_GEN) $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
 local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
-	$(AM_V_GEN) $(LN_S) $< $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@
 local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
-	$(AM_V_GEN) $(LN_S) $< $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@
 #
 all-local: $(BUILT_DOCS) $(HTML_DIR)/*
 clean-local:
-- 
cgit v1.2.3