X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=doc%2FMakefile.am;h=cbb5210dcc6a06e1d37f8c59b76b02e776ccca95;hb=28a4ea7f714956d34f7ac65354577b87bec5620d;hp=622de9b21ca1b7b2fc549eb707ae630b2aa289a2;hpb=0c009d2b6df523bba7a10ad148287bed2df9ebd6;p=fontconfig.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 622de9b..cbb5210 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -75,7 +75,8 @@ DOC_FUNCS_SGML=\
 	fcstrset.sgml \
 	fcvalue.sgml
 
-man_MANS=fonts-conf.5 @DOCMAN3@
+man5_MANS=fonts-conf.5 
+man3_MANS=$(DOCMAN3)
 
 noinst_PROGRAMS=edit-sgml
 edit_sgml_SOURCES=edit-sgml.c
@@ -83,9 +84,9 @@ edit_sgml_SOURCES=edit-sgml.c
 docdir=@DOCDIR@
 
 DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
-LOCAL_DOCS=$(man_MANS) $(DOC_FILES) $(HTML_DIR)/*
+LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*
 
-EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL) confdir.sgml.in
+EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) func.sgml confdir.sgml.in
 
 SUFFIXES=.fncs .sgml .txt .html
 
@@ -103,11 +104,11 @@ if USEDOCBOOK
 	$(RM) $@
 	$(DOC2PDF) $<
 
-$(man_MANS): func.refs
+$(man3_MANS): func.refs
 
 func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) func.refs
-	$(DOC2MAN) local-fontconfig-devel.sgml
+	$(DOC2MAN) local-fontconfig-devel.sgml && \
 	mv manpage.refs func.refs
 	$(RM) manpage.links
 
@@ -127,22 +128,23 @@ local-fontconfig-user.sgml: fontconfig-user.sgml
 all-local: $(LOCAL_DOCS)
 
 clean-local:
-	$(RM) $(man_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs
+	$(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs
 	$(RM) -r $(HTML_DIR)
 
 $(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) -r $(HTML_DIR)
 	$(DOC2HTML) -o $(HTML_DIR) local-fontconfig-devel.sgml
 
-fontconfig-devel.txt: local-fontconfig-devel.sgml version.sgml confdir.sgml
+fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) $@
 	$(DOC2TXT) local-fontconfig-devel.sgml
 	mv local-fontconfig-devel.txt $@
 
-fontconfig-devel.pdf: local-fontconfig-devel.sgml version.sgml confdir.sgml
+fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) $@
-	$(DOC2PDF) local-fontconfig-devel.sgml
-	mv local-fontconfig-devel.pdf $@
+	$(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+	|| echo Failed to generate $@ >&2; \
+	(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
 fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@ local-$@ $@.tmp
@@ -158,8 +160,9 @@ fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
 
 fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@
-	$(DOC2PDF) local-fontconfig-user.sgml
-	mv local-fontconfig-user.pdf $@
+	$(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+	|| echo Failed to generate $@ >&2; \
+	(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
 STRIPNL=awk '{ if (NR > 1) printf ("\n"); printf ("%s", $$0); }'
 confdir.sgml: ${DOC_SRC}/confdir.sgml.in
@@ -167,7 +170,14 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in
 
 CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml
 
+htmldoc_DATA = $(HTML_DIR)/*
+
+$(HTML_DIR)/*: $(HTML_DIR)
+
 else
+
+htmldoc_DATA = $(srcdir)/$(HTML_DIR)/*
+
 all-local:
 clean-local:
 endif
@@ -176,6 +186,3 @@ htmldocdir=$(docdir)/$(HTML_DIR)
 
 doc_DATA = $(DOC_FILES)
 
-htmldoc_DATA = $(HTML_DIR)/*
-
-$(HTML_DIR)/*: $(HTML_DIR)