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
This commit is contained in:
Jean-Marc Lasgouttes 2011-08-23 10:42:35 +00:00
parent 7fc83acb5e
commit f4a2142ee8

View File

@ -613,13 +613,21 @@ def checkConverterEntries():
checkLuatex() checkLuatex()
# First search for tex2lyx with version suffix (bug 6986). If nothing ''' If we're running LyX in-place then tex2lyx will be found in
# has been found, use 'tex2lyx' which is present in the build tree ../src/tex2lyx. Add this directory to the PATH temporarily and
# when running in place. 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'], checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'],
rc_entry = [r'''\converter latex lyx "%% -f $$i $$o" "" rc_entry = [r'''\converter latex lyx "%% -f $$i $$o" ""
\converter literate lyx "%% -n -f $$i $$o" ""'''], \converter literate lyx "%% -n -f $$i $$o" ""'''])
not_found = 'tex2lyx')
os.environ["PATH"] = path_orig
# #
checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'], checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'],