Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 17 Dec 2013 14:50:07 UTC Commit: 9a236fb04e8d5f4eb6dc340e23e51f1ff013fe3c https://github.com/geany/geany/commit/9a236fb04e8d5f4eb6dc340e23e51f1ff013fe...

Log Message: ----------- Autotools: fix building the documentation in VPATH builds

Modified Paths: -------------- doc/Makefile.am

Modified: doc/Makefile.am 13 files changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -9,26 +9,29 @@ EXTRA_DIST = geany.html geany.css geany.txt geany.1 \

pdf: geany.txt rst2latex -stg --documentoptions="10pt,a4paper" --output-encoding=utf8 $(srcdir)/geany.txt geany.tex - pdflatex geany.tex + (absbuilddir="$$(pwd)/$(builddir)"; \ + cd "$(srcdir)" && \ + pdflatex -output-directory="$$absbuilddir" "$$absbuilddir/geany.tex") rm -f geany.tex geany.aux geany.log geany.out - mv $(srcdir)/geany.pdf geany-$(VERSION).pdf + mv geany.pdf geany-$(VERSION).pdf

api-doc: Doxyfile doxygen

hacking-doc: ../HACKING - rst2html -stg --stylesheet=geany.css $^ hacking.html + rst2html -stg --stylesheet=$(srcdir)/geany.css $< hacking.html

# when generating documentation, first try rst2html.py as it is the upstream default doc: geany.txt (rst2html.py --version) < /dev/null > /dev/null 2>&1 && \ - rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \ - rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html + rst2html.py -stg --stylesheet=$(srcdir)/geany.css $< geany.html || \ + rst2html -stg --stylesheet=$(srcdir)/geany.css $< geany.html

doc-clean: rm -f geany.html rm -f geany.1 rm -f *.pdf + rm -f hacking.html

uninstall-local: rm -rf $(DOCDIR);

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).