* doc/ref_guide/Makefile.am, * doc/tutorial/Makefile.am, * doc/white_paper/Makefile.am: check if srcdir == builddir.
--- milena/ChangeLog | 8 ++++++++ milena/doc/ref_guide/Makefile.am | 5 +++-- milena/doc/tutorial/Makefile.am | 5 +++-- milena/doc/white_paper/Makefile.am | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog index 287e058..2ee2ea3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Guillaume Lazzara guillaume.lazzara@lrde.epita.fr
+ Do not move documentation files if srcdir == builddir. + + * doc/ref_guide/Makefile.am, + * doc/tutorial/Makefile.am, + * doc/white_paper/Makefile.am: check if srcdir == builddir. + +2009-07-13 Guillaume Lazzara guillaume.lazzara@lrde.epita.fr + Fix documentation generation.
* doc/examples/Makefile.am: Check if directory exists before diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index 31a5abb..9870a07 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -68,8 +68,9 @@ ref-guide-pdf: $(REF_GUIDE_PDF) $(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f ref_guide.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || mv -f $(builddir)/ref_guide.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/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 3a2c61f..12f52ad 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -66,8 +66,9 @@ tutorial-pdf: $(TUTORIAL_PDF) $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f tutorial.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || 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 5901d0e..66b42cb 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -75,8 +75,9 @@ white-paper-pdf: $(WHITE_PAPER_PDF) $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f white_paper.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || mv -f white_paper.pdf $(srcdir)
dist_doc_DATA = \
-
Guillaume Lazzara