From 832f537703cb1c0b8425f85e0da8b9a580b2351f Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Sun, 7 May 2017 20:33:52 +0200
Subject: [PATCH] Re-simplify latexmkrc syntax: it works!

---
 sphinx/texinputs/Makefile_t  | 2 +-
 sphinx/texinputs/latexmkjarc | 2 +-
 sphinx/texinputs/latexmkrc   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sphinx/texinputs/Makefile_t b/sphinx/texinputs/Makefile_t
index 3905182b5..d07894a56 100644
--- a/sphinx/texinputs/Makefile_t
+++ b/sphinx/texinputs/Makefile_t
@@ -14,7 +14,7 @@ ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg)
 
 # Prefix for archive names
 ARCHIVEPRREFIX =
-# Additional LaTeX options (used by latexmk via latexmkrc/latexmkjarc file)
+# Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file)
 export LATEXOPTS = --interaction=nonstopmode
 # Additional latexmk options
 LATEXMKOPTS = -f
diff --git a/sphinx/texinputs/latexmkjarc b/sphinx/texinputs/latexmkjarc
index 39ea47f3b..2124d4673 100644
--- a/sphinx/texinputs/latexmkjarc
+++ b/sphinx/texinputs/latexmkjarc
@@ -1,4 +1,4 @@
-$latex = 'platex ' . $ENV{'LATEXOPTS'} . ' -kanji=utf8 %O %S';
+$latex = 'platex $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 1e1ec1903..e0bfe9fd0 100644
--- a/sphinx/texinputs/latexmkrc
+++ b/sphinx/texinputs/latexmkrc
@@ -1,7 +1,7 @@
-$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';
+$latex = 'latex $LATEXOPTS %O %S';
+$pdflatex = 'pdflatex $LATEXOPTS %O %S';
+$lualatex = 'lualatex $LATEXOPTS %O %S';
+$xelatex = 'xelatex --no-pdf $LATEXOPTS %O %S';
 $makeindex = 'makeindex -s python.ist %O -o %D %S';
 add_cus_dep( "glo", "gls", 0, "makeglo" );
 sub makeglo {