[Apcupsd-commits] apcupsd/src/win32/installer winapcupsd.nsi, 1.2, 1.3

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/win32/installer
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4067/src/win32/installer

Modified Files:
	winapcupsd.nsi 
Log Message:
Merge Branch-3_14:2008-06-31 thru Branch-3_14:2009-05-25
Changes from releases 3.14.5 and 3.14.6.


Index: winapcupsd.nsi
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/win32/installer/winapcupsd.nsi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winapcupsd.nsi	30 Sep 2007 19:49:49 -0000	1.2
+++ winapcupsd.nsi	25 May 2009 22:18:09 -0000	1.3
@@ -240,12 +240,16 @@
 
 Section "-Startup"
   ; Check for existing installation
+  ; In the future we should check for existing HKLM\Software\Apcupsd\InstDir
   ${If} ${FileExists} "$INSTDIR\etc\apcupsd\apcupsd.conf"
     StrCpy $ExistingConfig 1
   ${Else}
     StrCpy $ExistingConfig 0
   ${EndIf}
 
+  ; Save the new install path in the registry
+  WriteRegStr HKLM "Software\Apcupsd\" "InstDir" "$INSTDIR"
+
   ; Create base installation directory
   CreateDirectory "$INSTDIR"
 
@@ -300,9 +304,6 @@
   File ${DEPKGS}\libusb-win32\libusb0_x64.dll
   File ${TOPDIR}\platforms\mingw\install.txt
 
-  SetOutPath "$INSTDIR\examples"
-  File ${TOPDIR}\examples\*
-
   SetOutPath "$INSTDIR\etc\apcupsd"
   File ${TOPDIR}\platforms\mingw\apccontrol.bat
   File ${TOPDIR}\platforms\mingw\apcupsd.conf.in
@@ -352,8 +353,8 @@
 Section "Documentation" SecDoc
   SetOutPath "$INSTDIR\doc"
   CreateDirectory "$INSTDIR\doc"
-  File ${TOPDIR}\doc\latex\manual.html
-  File ${TOPDIR}\doc\latex\*.png
+  File ${TOPDIR}\doc\manual\manual.html
+  File ${TOPDIR}\doc\manual\*.png
   ; Create Start Menu entry
   SetShellVarContext all
   CreateShortCut "$SMPROGRAMS\Apcupsd\Manual.lnk" "$INSTDIR\doc\manual.html"