Imported recent work in Maneage, minor conflicts fixed

Only two small conflicts came up:

 * The addition of the hardware architecture macro in 'paper.tex' (which
   was removed for now, but will be added as the referee has requested
   within the text).

 * The usage of "" around directory variables in 'paper.mk'.

1 files changed, 6 insertions, 5 deletions

diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk
index 2c08847..f363b6f 100644
--- a/reproduce/analysis/make/paper.mk
+++ b/reproduce/analysis/make/paper.mk
@@ -47,8 +47,9 @@ $(mtexdir)/project.tex: $(mtexdir)/verify.tex
 	@if [ -f .local/bin/latex ] && [ x"$(pdf-build-final)" != x ]; then
 
           # Put a LaTeX input command for all the necessary macro files.
+          # 'hardware-parameters.tex' is created in 'configure.sh'.
 	  rm -f $(mtexdir)/project.tex
-	  for t in $(subst paper,,$(makesrc)); do
+	  for t in $(subst paper,,$(makesrc)) hardware-parameters; do
 	    echo "\input{tex/build/macros/$$t.tex}" >> $(mtexdir)/project.tex
 	  done
 	else
@@ -127,7 +128,7 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \
           # do not use PGFPlots, then you should remove the `-shell-escape'
           # option for better security. See
           # https://savannah.nongnu.org/task/?15694 for details.
-	  latex -shell-escape -halt-on-error $$p/paper.tex
+	  latex -shell-escape -halt-on-error "$$p"/paper.tex
 	  bibtex paper
 
           # Hack: tidy up eprint+doi style that didn't work in .bst file.
@@ -143,7 +144,7 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \
 	    | sed -e 's/EOLINE/\n/g' > paper.bbl
 
           # The pre-final run of LaTeX after 'paper.bbl' was created.
-	  latex -shell-escape -halt-on-error $$p/paper.tex
+	  latex -shell-escape -halt-on-error "$$p"/paper.tex
 	fi
 
 
@@ -171,7 +172,7 @@ paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl
 
           # See above for a warning and brief discussion on the the
           # pdflatex option `-shell-escape'.
-	  latex -shell-escape -halt-on-error $$p/paper.tex
+	  latex -shell-escape -halt-on-error "$$p"/paper.tex
 
           # Convert the DVI to PostScript, and the PostScript to PDF. The
           # `-dNOSAFER' option to GhostScript allows transparencies in the
@@ -182,6 +183,6 @@ paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl
 
           # Come back to the top project directory and copy the built PDF
           # file here.
-	  cd $$p
+	  cd "$$p"
 	  cp $(texbdir)/$@ $(final-paper)
 	fi