Index: doc/papers/concurrency/Makefile
===================================================================
--- doc/papers/concurrency/Makefile	(revision a43dd549e90bdc806c0d76e79211059557128362)
+++ doc/papers/concurrency/Makefile	(revision cc344bef8f727acf7296beaca24918d710adf231)
@@ -2,10 +2,12 @@
 
 Build = build
+Figures = figures
 Macros = ../../LaTeXmacros
-TeXLIB = .:style:annex:${Macros}:${Build}:/usr/local/bibliographies:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build} -interaction=nonstopmode
+TeXLIB = .:style:annex:${Macros}:${Build}:../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Figures}
 
 ## Define the text source files.
@@ -41,5 +43,5 @@
 # Directives #
 
-.PHONY : all clean										# not file names
+.PHONY : all clean					# not file names
 
 all : ${DOCUMENT}
@@ -57,31 +59,30 @@
 
 ${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-			${Macros}/common.tex ${Macros}/indexstyle annex/local.bib /usr/local/bibliographies/pl.bib
-	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi # Must have *.aux file containing citations for bibtex
-	-${BibTeX} ${Build}/${basename $@}					# Some citations reference others so run again to resolve these citations
+		${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../bibliography/pl.bib
+	# Must have *.aux file containing citations for bibtex
+	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
+	-${BibTeX} ${Build}/${basename $@}
+	# Some citations reference others so run again to resolve these citations
 	${LaTeX} ${basename $@}.tex
 	-${BibTeX} ${Build}/${basename $@}
-	${LaTeX} ${basename $@}.tex							# Finish citations
+	# Run again to finish citations
+	${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
-
-vpath %.tex ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}	# add prefix for source
-vpath %.fig ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}	# add prefix for source
 
 ${Build}:
 	mkdir -p ${Build}
 
-%.tex : figures/%.fig
+%.tex : %.fig
 	fig2dev -L eepic $< > ${Build}/$@
 
-%.ps : figures/%.fig
+%.ps : %.fig
 	fig2dev -L ps $< > ${Build}/$@
 
-%.pstex : figures/%.fig
+%.pstex : %.fig
 	fig2dev -L pstex $< > ${Build}/$@
 	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 # Local Variables: #
-# tab-width : 4 #
 # compile-command: "make" #
 # End: #