From f4a2142ee80c0bf6fc8d0301dbd0f6255bc4b1c0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 23 Aug 2011 10:42:35 +0000 Subject: [PATCH] Revert part of r39509 that was not supposed to go in. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39510 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index f6b620c03d..69a9d95a07 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -613,13 +613,21 @@ def checkConverterEntries(): checkLuatex() -# First search for tex2lyx with version suffix (bug 6986). If nothing -# has been found, use 'tex2lyx' which is present in the build tree -# when running in place. + ''' If we're running LyX in-place then tex2lyx will be found in + ../src/tex2lyx. Add this directory to the PATH temporarily and + search for tex2lyx. + Use PATH to avoid any problems with paths-with-spaces. + ''' + path_orig = os.environ["PATH"] + os.environ["PATH"] = os.path.join('..', 'src', 'tex2lyx') + \ + os.pathsep + path_orig + +# First search for tex2lyx with version suffix (bug 6986) checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'], rc_entry = [r'''\converter latex lyx "%% -f $$i $$o" "" -\converter literate lyx "%% -n -f $$i $$o" ""'''], - not_found = 'tex2lyx') +\converter literate lyx "%% -n -f $$i $$o" ""''']) + + os.environ["PATH"] = path_orig # checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'],