The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 4dd05e1f3530d35616dc01e825f72700f50e43d8
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Nov 14 23:32:20 2012 +0100
installer: partyl revert last commit
- my changes were accidentally pushed before I even finished to write the
commit message, sorry
diff --git a/development/Win32/packaging/installer/include/detection.nsh
b/development/Win32/packaging/installer/include/detection.nsh
index 7019666..11489d6 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -246,7 +246,7 @@ Function EditorCheck
StrCpy $0 ""
ReadRegStr $0 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation"
${if} $0 != ""
- StrCpy $EditorPath "$EditorPath;f$0"
+ StrCpy $EditorPath "$EditorPath;$0"
${endif}
FunctionEnd
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 840b37d..f84137a 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -35,10 +35,10 @@ These typically need to be modified for each LyX release
# File locations
# !!! you need to adjust them to the folders in your Windows system !!!
-!define FILES_LYX "D:\LyXPackage2.0\LyX"
-!define FILES_DEPS "D:\LyXGit\2.0.x\lyx-windows-deps-msvc2008"
-!define FILES_BUNDLE "D:\LyX\depsbundle"
-!define FILES_QT "D:\Qt"
+!define FILES_LYX "C:\LyX\lyx-20-install"
+!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
+!define FILES_BUNDLE "C:\LyX\depsbundle"
+!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
-----------------------------------------------------------------------
Summary of changes:
.../packaging/installer/include/detection.nsh | 2 +-
development/Win32/packaging/installer/settings.nsh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
The LyX Source Repository
