From 2e249325cf729e448b062e1eeda530c3859a16a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Fri, 12 Aug 2011 23:00:43 +0000 Subject: [PATCH] installer: fix my commit r39479 - I accidentally committed a test version, sorry git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39480 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../Win32/packaging/installer/include/detection.nsh | 2 +- .../Win32/packaging/installer/setup/configure.nsh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index f3b5c04868..57e9b229ca 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -143,7 +143,7 @@ Function MissingPrograms StrCpy $JabRefInstalled == "Yes" ${endif} - # test if and where the BibTeX-editor JabRef is installed + # test if and where LilyPond is installed ReadRegStr $LilyPondPath HKLM "Software\LilyPond" "Install_Dir" ${if} $LilyPondPath != "" StrCpy $LilyPondPath "$LilyPondPath\usr\bin" # add "\usr\bin" diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index bbe74966ce..bccf881a2d 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -149,13 +149,13 @@ Section -Configure ${endif} # if LilyPondPath was found # we need to add these entris because python scripts can only be executed - # if the full path to lilypond-book.py is given + # if the full path is given ${if} $LilyPondPath != "" FileWrite $R1 '\format "lilypond-book" "lytex" "LilyPond book (LaTeX)" "" "" "auto" "document,menu=export"$\r$\n\ - \converter "lilypond-book" "pdflatex" "python \"C:\\Program Files (x86)\\LilyPond\\usr\\bin\\lilypond-book.py\" --safe --pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "xetex" "python \"C:\\Program Files (x86)\\LilyPond\\usr\\bin\\lilypond-book.py\" --safe --pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "luatex" "python \"C:\\Program Files (x86)\\LilyPond\\usr\\bin\\lilypond-book.py\" --safe --pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "latex" "python \"C:\\Program Files (x86)\\LilyPond\\usr\\bin\\lilypond-book.py\" --safe --lily-output-dir=ly-eps $$$$i" ""$\r$\n' + \converter "lilypond-book" "pdflatex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ + \converter "lilypond-book" "xetex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ + \converter "lilypond-book" "luatex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ + \converter "lilypond-book" "latex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --lily-output-dir=ly-eps $$$$i" ""$\r$\n' ${endif} FileClose $R1 IfErrors 0 +2