Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision 04ba967ec417be3b50b6a61d784026cb05c1d07b)
+++ doc/papers/general/Makefile	(revision 49eb6a2332de13d116c1e1d70994bf6e76fd66c7)
@@ -3,10 +3,10 @@
 Build = build
 Figures = figures
-Macros = ../../LaTeXmacros
+Macros = AMA/AMA-stix/ama
 TeXLIB = .:${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 #
+MAKEFLAGS = --no-print-directory # --silent
 VPATH = ${Build} ${Figures} evaluation
 
@@ -50,14 +50,14 @@
 
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
-	dvips ${Build}/$< -o $@
+	dvips -h ${Build}/Paper.out.ps -o $@ ${Build}/$<
 
 ${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
-		${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
+		../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
 	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-	-${BibTeX} ${Build}/${basename $@}
+	${BibTeX} ${Build}/${basename $@}
 	# Some citations reference others so run again to resolve these citations
 	${LaTeX} ${basename $@}.tex
-	-${BibTeX} ${Build}/${basename $@}
+	${BibTeX} ${Build}/${basename $@}
 	# Run again to finish citations
 	${LaTeX} ${basename $@}.tex