anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix checkTeXPaths when no latex is found

Browse Source 
(reallows the install of LyX without MikTeX again under windows)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38142 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-03-30 00:26:19 +00:00
parent 9abb85aa72
commit 6826bd487f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/configure.py
View File

@ -96,6 +96,8 @@ def createDirectories():
def checkTeXPaths(): def checkTeXPaths():
''' Determine the path-style needed by the TeX engine on Win32 (Cygwin) ''' ''' Determine the path-style needed by the TeX engine on Win32 (Cygwin) '''
windows_style_tex_paths = '' windows_style_tex_paths = ''
if LATEX == '':
return windows_style_tex_paths
if os.name == 'nt' or sys.platform == 'cygwin': if os.name == 'nt' or sys.platform == 'cygwin':
from tempfile import mkstemp from tempfile import mkstemp
fd, tmpfname = mkstemp(suffix='.ltx') fd, tmpfname = mkstemp(suffix='.ltx')
@ -1340,7 +1342,6 @@ Options:
sys.exit(1) sys.exit(1)
setEnviron() setEnviron()
createDirectories() createDirectories()
windows_style_tex_paths = checkTeXPaths()
dtl_tools = checkDTLtools() dtl_tools = checkDTLtools()
## Write the first part of outfile ## Write the first part of outfile
writeToFile(outfile, '''# This file has been automatically generated by LyX' lib/configure.py writeToFile(outfile, '''# This file has been automatically generated by LyX' lib/configure.py
@ -1356,6 +1357,7 @@ Options:
checkConverterEntries() checkConverterEntries()
(chk_docbook, bool_docbook, docbook_cmd) = checkDocBook() (chk_docbook, bool_docbook, docbook_cmd) = checkDocBook()
checkTeXAllowSpaces() checkTeXAllowSpaces()
windows_style_tex_paths = checkTeXPaths()
if windows_style_tex_paths != '': if windows_style_tex_paths != '':
addToRC(r'\tex_expects_windows_paths %s' % windows_style_tex_paths) addToRC(r'\tex_expects_windows_paths %s' % windows_style_tex_paths)
checkOtherEntries() checkOtherEntries()