From 89cb89c78ceefb4935a257f9b7a58c71a379158a Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Wed, 7 Sep 2011 23:56:47 +0000 Subject: [PATCH] * configure.py : Fix the detection of splitindex (#7579) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39639 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index d1ed7f72cb..b6d3152ced 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -961,11 +961,12 @@ def checkOtherEntries(java='', perl=''): alt_rc_entry = [ r'\index_alternatives "%%"' ]) checkProg('an index processor appropriate to Japanese', ['mendex -c -q', 'jmakeindex -c -q', 'makeindex -c -q'], rc_entry = [ r'\jindex_command "%%"' ]) - path, splitindex = checkProg('the splitindex processor', ['splitindex.pl', 'splitindex'], - rc_entry = [ r'\splitindex_command "%%"' ]) - if splitindex == '': - checkProg('the splitindex processor (java version)', ['splitindex.class'], - rc_entry = [ r'\splitindex_command "java splitindex"' ]) + path, splitindex = checkProg('the splitindex processor', ['splitindex.pl', 'splitindex', + 'splitindex.class'], rc_entry = ['', r'\splitindex_command "%%"', '', '']) + if splitindex == 'splitindex.pl' and perl != '': + addToRC(r'\splitindex_command "%s -w \"%s\""' % (perl, os.path.join(path, splitindex))) + elif splitindex == 'splitindex.class' and java != '': + addToRC(r'\splitindex_command "%s \"%s\""' % (java, os.path.join(path, 'splitindex'))) checkProg('a nomenclature processor', ['makeindex'], rc_entry = [ r'\nomencl_command "makeindex -s nomencl.ist"' ]) ## FIXME: OCTAVE is not used anywhere -- 2.39.2