A few fixups for make distcheck

[fontconfig.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3477eb77770cb3b99aab50efe5ac3ab870b33bdc..bf1ab99f48b8d0a91e98e50b7f3fca7740b4e2e0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -108,7 +108,7 @@ $(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
 
@@ -119,7 +119,7 @@ $(DOC_FUNCS_SGML): edit-sgml$(EXEEXT) $(FNCS_TMPL)
 
 fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
        $(RM) $@
-       $(DOC2MAN) local-fontconfig-user.sgml
+       $(DOC2MAN) local-fontconfig-user.sgml && \
        $(RM) manpage.refs manpage.links
        
 local-fontconfig-user.sgml: fontconfig-user.sgml
@@ -142,7 +142,7 @@ fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml
 
 fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
        $(RM) $@
-       ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+       $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
        || echo Failed to generate $@ >&2; \
        (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
@@ -160,7 +160,7 @@ fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
 
 fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
        $(RM) $@
-       ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+       $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
        || echo Failed to generate $@ >&2; \
        (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
@@ -170,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
@@ -179,6 +186,3 @@ htmldocdir=$(docdir)/$(HTML_DIR)
 
 doc_DATA = $(DOC_FILES)
 
-htmldoc_DATA = $(HTML_DIR)/*
-
-$(HTML_DIR)/*: $(HTML_DIR)