On 04/04/2011 2:11 AM, Jürgen Spitzmüller wrote:
Julien Rioux wrote:
for branch?

Yes, please-

Jürgen


Is this how I should do this sort of things? I mean the status.16x part?

--
Julien
Index: status.16x
===================================================================
--- status.16x	(revision 38243)
+++ status.16x	(working copy)
@@ -88,3 +88,5 @@
 
 - Fix compilation with gcc 4.6 (bug 7285).
 
+- Fix reconfigure script: allow LaTeX-less install of LyX under Windows.
+
Index: lib/configure.py
===================================================================
--- lib/configure.py	(revision 38243)
+++ lib/configure.py	(working copy)
@@ -97,6 +97,8 @@
 def checkTeXPaths():
     ''' Determine the path-style needed by the TeX engine on Win32 (Cygwin) '''
     windows_style_tex_paths = ''
+    if LATEX == '':
+        return windows_style_tex_paths
     if os.name == 'nt' or sys.platform == 'cygwin':
         from tempfile import mkstemp
         fd, tmpfname = mkstemp(suffix='.ltx')
@@ -991,7 +993,6 @@
         sys.exit(1)
     setEnviron()
     createDirectories()
-    windows_style_tex_paths = checkTeXPaths()
     dtl_tools = checkDTLtools()
     ## Write the first part of outfile
     writeToFile(outfile, '''# This file has been automatically generated by LyX' lib/configure.py
@@ -1007,6 +1008,7 @@
     checkConverterEntries()
     (chk_docbook, bool_docbook, docbook_cmd) = checkDocBook()
     checkTeXAllowSpaces()
+    windows_style_tex_paths = checkTeXPaths()
     if windows_style_tex_paths != '':
         addToRC(r'\tex_expects_windows_paths %s' % windows_style_tex_paths)
     checkOtherEntries()

Reply via email to