From 3e8532d83e2270062b3134b72938ef950668bb6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Sun, 6 Sep 2009 09:30:33 +0000 Subject: [PATCH] * configure.py: fix construction of *_alternatives rc. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31303 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index a8a9cdb2be..acd4881219 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -206,6 +206,8 @@ def checkProgAlternatives(description, progs, rc_entry = [], alt_rc_entry = [], for ext in extlist: if os.path.isfile( os.path.join(ac_dir, ac_word + ext) ): logger.info(msg + ' yes') + pr = re.compile(r'(\\\S+)(.*)$') + m = None # write rc entries for this command if found_prime == False: if len(rc_entry) == 1: @@ -219,13 +221,17 @@ def checkProgAlternatives(description, progs, rc_entry = [], alt_rc_entry = [], alt_rc = alt_rc_entry[0] if alt_rc == "": # if no explicit alt_rc is given, construct one - alt_rc = rc_entry[0] + "_alternatives" + m = pr.match(rc_entry[0]) + if m: + alt_rc = m.group(1) + "_alternatives" + m.group(2) addToRC(alt_rc.replace('%%', ac_prog)) elif len(alt_rc_entry) > 1: alt_rc = alt_rc_entry[idx] if alt_rc == "": # if no explicit alt_rc is given, construct one - alt_rc = rc_entry[idx] + "_alternatives" + m = pr.match(rc_entry[idx]) + if m: + alt_rc = m.group(1) + "_alternatives" + m.group(2) addToRC(alt_rc.replace('%%', ac_prog)) found_alt = True break -- 2.39.2