- ''' 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)
- path, t2l = checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'],
+ # Look for tex2lyx in this order (see bugs #3308 and #6986):
+ # 1) If we're running LyX in-place then tex2lyx will be found
+ # in ../src/tex2lyx with respect to the srcdir.
+ # 2) If LyX was configured with a version suffix then tex2lyx
+ # will also have this version suffix.
+ # 3) Otherwise always use tex2lyx.
+ in_place = os.path.join('srcdir', '..', 'src', 'tex2lyx', 'tex2lyx')
+ in_place = os.path.abspath(in_place)
+
+ path, t2l = checkProg('a LaTeX/Noweb -> LyX converter', [in_place, 'tex2lyx' + version_suffix, 'tex2lyx'],