Changeset 1998 for trunk/doc

Timestamp:

Jun 13, 2009, 2:34:19 AM (12 years ago)

Author:

Peter

Message:

Merged patch release 0.5.4 to the trunk. Delta 0.5.4 - 0.5.3

File:

• trunk/doc/Makefile.am (modified) (3 diffs)

trunk/doc/Makefile.am

@@ -56 +56 @@
 doc: html dvi ps pdf
 
-if HAVE_DOXYGEN
-
 
 # these are supported by automake and *-local will add target to *
+if DX_ENABLE_DVI
 dvi-local: $(PACKAGE).dvi
+endif
+if DX_ENABLE_PS
 ps-local: $(PACKAGE).ps
+endif
+if DX_ENABLE_PDF
 pdf-local: $(PACKAGE).pdf
+endif
+if DX_ENABLE_HTML
 html-local: $(DX_HTML_OUTPUT)/index.html
+endif
 
 # this is not supported by automake - there is no target latex
+if DX_ENABLE_LATEX
 latex-local: $(DX_LATEX_OUTPUT)/refman.tex
+endif
 
 $(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
@@ -77 +85 @@
 
 $(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
-  cd $(DX_LATEX_OUTPUT) && latex refman.tex && latex refman.tex
+  cd $(DX_LATEX_OUTPUT) && $(latex) refman.tex && $(latex) refman.tex
   cp $(DX_LATEX_OUTPUT)/refman.dvi $(PACKAGE).dvi
 
 $(PACKAGE).ps: $(PACKAGE).dvi
-  cd $(DX_LATEX_OUTPUT) && dvips -q -o refman.ps refman.dvi;
+  cd $(DX_LATEX_OUTPUT) && $(dvips) -q -o refman.ps refman.dvi;
   cp $(DX_LATEX_OUTPUT)/refman.ps $(PACKAGE).ps
 
@@ -88 +96 @@
   cp $(DX_LATEX_OUTPUT)/refman.pdf $(PACKAGE).pdf
 
-endif
 
 install-data-hook: