[Olena-patches] 4284: Fix documentation generation.

* doc/examples/Makefile.am: Check if directory exists before creating it. * doc/white_paper/Makefile.am, * doc/ref_guide/Makefile.am: Do not move output file. It is already created in the source directory. * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not move html output since it is already created in the source directory. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/examples/Makefile.am | 3 ++- milena/doc/ref_guide/Makefile.am | 3 +-- milena/doc/tutorial/Makefile.am | 5 ++--- milena/doc/white_paper/Makefile.am | 5 ++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 17453d8..287e058 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-07-13 Guillaume Lazzara &lt;guillaume.lazzara(a)lrde.epita.fr&gt; + Fix documentation generation. + + * doc/examples/Makefile.am: Check if directory exists before + creating it. + + * doc/white_paper/Makefile.am, + * doc/ref_guide/Makefile.am: Do not move output file. It is + already created in the source directory. + + * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not + move html output since it is already created in the source + directory. + +2009-07-13 Guillaume Lazzara &lt;guillaume.lazzara(a)lrde.epita.fr&gt; + Fix data-regen rule in documentation. * doc/examples/Makefile.am: fix 'data-regen' rule. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index e0d14bc..843c6b3 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -143,7 +143,8 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc examples: $(EXTRA_PROGRAMS) run-examples: examples - mkdir -p $(top_builddir)/milena/doc/figures; \ + test -d $(top_builddir)/milena/doc/figures \ + || mkdir $(top_builddir)/milena/doc/figures; \ @failcom='exit 1'; \ list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index f13074f..31a5abb 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -59,8 +59,7 @@ REF_GUIDE_HH = $(srcdir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) $(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) \ - && mv -f ref_guide.hh $(srcdir) + $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) # Final product. diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 5cd7464..3a2c61f 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -58,8 +58,7 @@ TUTORIAL_HH = $(srcdir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) $(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) \ - && mv tutorial.hh $(srcdir) + $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) # Final product. TUTORIAL_PDF = $(srcdir)/tutorial.pdf @@ -68,7 +67,7 @@ $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && tutorial.pdf $(srcdir) + && mv -f tutorial.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index df0a51b..5901d0e 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -65,10 +65,9 @@ white-paper: white-paper-pdf white-paper-html WHITE_PAPER_HTML = $(srcdir)/white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) $(WHITE_PAPER_HTML): white_paper.tex $(EPSS) - test -d white_paper_html || mkdir white_paper_html + test -d $(srcdir)/white_paper_html || mkdir $(srcdir)/white_paper_html TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@ $(top_srcdir)/milena/doc/tools/clearbanner.sh $@ - mv -f white_paper_html $(srcdir) WHITE_PAPER_PDF = $(srcdir)/white_paper.pdf @@ -77,7 +76,7 @@ $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv white_paper.pdf $(srcdir) + && mv -f white_paper.pdf $(srcdir) dist_doc_DATA = \ -- 1.5.6.5