From 1385e1ac1b59349826a8b9c10a836c30b49912ed Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Tue, 9 May 2017 23:32:47 +0200
Subject: [PATCH] Use (again) Perl concatenation for latexmk variables (refs
 #3719)

Indeed, with this latexmk will display something like

Running 'pdflatex --halt-on-error --interaction=batchmode  -recorder
"sphinx.tex"'

if `make latexpdf` was invoked with `LATEXOPTS="--halt... "`, which
is more useful console output than:

Running 'pdflatex $LATEXOPTS -recorder "sphinx.tex"'

as is the case without this commit.
---
 sphinx/texinputs/latexmkjarc | 2 +-
 sphinx/texinputs/latexmkrc   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sphinx/texinputs/latexmkjarc b/sphinx/texinputs/latexmkjarc
index 2124d46730c..39ea47f3ba9 100644
--- a/sphinx/texinputs/latexmkjarc
+++ b/sphinx/texinputs/latexmkjarc
@@ -1,4 +1,4 @@
-$latex = 'platex $LATEXOPTS -kanji=utf8 %O %S';
+$latex = 'platex ' . $ENV{'LATEXOPTS'} . ' -kanji=utf8 %O %S';
 $dvipdf = 'dvipdfmx %O -o %D %S';
 $makeindex = 'rm -f %D; mendex -U -f -d %B.dic -s python.ist %S || echo "mendex exited with error code $? (ignoring)" && : >> %D';
 add_cus_dep( "glo", "gls", 0, "makeglo" );
diff --git a/sphinx/texinputs/latexmkrc b/sphinx/texinputs/latexmkrc
index e0bfe9fd07d..1e1ec1903f7 100644
--- a/sphinx/texinputs/latexmkrc
+++ b/sphinx/texinputs/latexmkrc
@@ -1,7 +1,7 @@
-$latex = 'latex $LATEXOPTS %O %S';
-$pdflatex = 'pdflatex $LATEXOPTS %O %S';
-$lualatex = 'lualatex $LATEXOPTS %O %S';
-$xelatex = 'xelatex --no-pdf $LATEXOPTS %O %S';
+$latex = 'latex ' . $ENV{'LATEXOPTS'} . ' %O %S';
+$pdflatex = 'pdflatex ' . $ENV{'LATEXOPTS'} . ' %O %S';
+$lualatex = 'lualatex ' . $ENV{'LATEXOPTS'} . ' %O %S';
+$xelatex = 'xelatex --no-pdf ' . $ENV{'LATEXOPTS'} . ' %O %S';
 $makeindex = 'makeindex -s python.ist %O -o %D %S';
 add_cus_dep( "glo", "gls", 0, "makeglo" );
 sub makeglo {