revert part of the last commit that should not have been

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39534 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index d810662e6dc0f7b36e64e3a0bd87b7030c084422..e2cfab7f98b46bec439f6d01eed814548f6e0a9b 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -642,14 +642,9 @@ def checkConverterEntries():
     checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'], 
         rc_entry = [ r'\converter sweave      r      "%%"    ""' ])
     #
-    path, htmltolatex = checkProg('an HTML -> LaTeX converter', ['html2latex $$i',
-        'gnuhtml2latex $$i', 'htmltolatex -input $$i -output $$o', 'htmltolatex.jar'],
-        rc_entry = [ r'\converter html       latex      "%%"   ""',
-                     r'\converter html       latex      "%%"   ""',
-                     r'\converter html       latex      "%%"   ""', '', ''] )
-    if htmltolatex == 'htmltolatex.jar':
-        addToRC(r'\converter html       latex      "java -jar %s -input $$i -output $$o"       ""'
-            % os.path.join(path, htmltolatex))
+    checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \
+        'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'],
+        rc_entry = [ r'\converter html       latex      "%%"   ""' ])
     #
     checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
         rc_entry = [ r'\converter word       latex      "%%"   ""' ])