]> git.lyx.org Git - lyx.git/commitdiff
installer: partyl revert last commit
authorUwe Stöhr <uwestoehr@lyx.org>
Wed, 14 Nov 2012 22:32:20 +0000 (23:32 +0100)
committerUwe Stöhr <uwestoehr@lyx.org>
Wed, 14 Nov 2012 22:32:20 +0000 (23:32 +0100)
- my changes were accidentally pushed before I even finished to write the commit message, sorry

development/Win32/packaging/installer/include/detection.nsh
development/Win32/packaging/installer/settings.nsh

index 7019666a7ad2f2a103aeef7394a685a7569f4f8f..11489d66d83e1115a95cd523f506a7d575922797 100644 (file)
@@ -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
index 840b37d59ac96bc3eab2318bc6fb8e054dd18961..f84137aaba638b87bdd1bac463802f2b19294dfc 100644 (file)
@@ -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"