am/latex

   Check whether bibtex is used at all before running it.

doc/Makefile.am
   Ignore subdirectory refinement if INKSCAPE is missing.

doc/refinement/Makefile.am
   Give a resonable error message if INKSCAPE is missing and someone
   runs make directly in doc/refinement.

[[Imported from SVN: r4084]]

am/latex

@@ -7,7 +7,9 @@
 	  $(TEX) </dev/null $* || exit $$?; \
 	done
 # check if Bibtex needs to be called
-	if grep '^\\citation{' *.aux > /dev/null ; then \
+	if grep '^\\bibdata{' *.aux > /dev/null \
+	   && grep '^\\citation{' *.aux > /dev/null; \
+	then \
 	  $(BIBTEX) $* || exit $$?; \
 	  $(TEX) </dev/null $* || exit $$?; \
 	  while grep Rerun $*.log > /dev/null ; do \

doc/Makefile.am

 # $Id$
 
-SUBDIRS = devel appl refinement doxygen layout istl
+if INKSCAPE
+INKSCAPE_SUBDIRS = refinement
+endif INKSCAPE
+SUBDIRS = devel appl $(INKSCAPE_SUBDIRS) doxygen layout istl
 
 if BUILD_DOCS
  PAGES = index.html buildsystem.html view-concept.html installation-notes.html

doc/refinement/Makefile.am

@@ -17,10 +17,15 @@ all: $(DOCS)
 refinement.dvi: refinement.tex simplexvertexindex.eps referencetokuhn0.eps kuhntriangulation.eps
 
 .svg.eps:
+if INKSCAPE
 	$(INKSCAPE) --export-dpi=180 -e $@.png $< || { rm -f $@.png ; exit 1; }
 	$(CONVERT) $@.png EPS:$@.tmp || { rm -f $@.tmp ; exit 1; }
 	mv $@.tmp $@
 	rm $@.png
+else !INKSCAPE
+	echo Sorry, you need inkscape installed to convert .svg into .eps
+	exit 1
+endif !INKSCAPE
 
 MOSTLYCLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps *.eps