From fdb1155035da677368f762d8fb24ad2f470a9813 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 11 Jun 2012 18:39:37 +0900 Subject: [PATCH] doc: Fix distcheck error again... --- doc/Makefile.am | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index e86abe9..328d72b 100644 --- a/doc/Makefile.am +++ b/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)" != "$(srcdir)" ] && $(RM) $(builddir)/fontconfig-user.sgml $(builddir)/fontconfig-devel.sgml else htmldoc_DATA += $(srcdir)/$(HTML_DIR)/* all-local: