From 1f281ae4bc27a0ed00c4e3025dfff7e403f81af8 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Fri, 15 Aug 2014 20:21:34 +0200
Subject: [PATCH] Some minor installer fixes (README file was not included).

---
 etc/setup/setup.nsi | 20 +++++++++++---------
 src/version.h       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi
index dfe81f4..15d2285 100644
--- a/etc/setup/setup.nsi
+++ b/etc/setup/setup.nsi
@@ -406,6 +406,7 @@ SectionEnd
 Section "!Install Files"
 	!insertmacro PrintProgress "$(X264_LANG_STATUS_INSTFILES)"
 
+	; Clean up an existing installation
 	Delete `$INSTDIR\*.exe`
 	Delete `$INSTDIR\*.dll`
 	Delete `$INSTDIR\*.txt`
@@ -432,10 +433,15 @@ Section "!Install Files"
 		MessageBox MB_TOPMOST|MB_ICONSTOP|MB_RETRYCANCEL 'Could not delete old "$R0" file. Is program still running?' IDRETRY DeleteOldBinary
 		Abort "Could not delete old binary!"
 	${EndIf}
-	
+
 	SetOutPath "$INSTDIR"
 	File /a `/oname=$R0` `${X264_SOURCE_PATH}\x264_launcher.exe`
 
+	SetOutPath "$INSTDIR"
+	File /a `${X264_SOURCE_PATH}\*.dll`
+	File /a `${X264_SOURCE_PATH}\*.txt`
+	File /a `${X264_SOURCE_PATH}\*.html`
+
 	SetOutPath "$INSTDIR\imageformats"
 	File /a `${X264_SOURCE_PATH}\imageformats\*.dll`
 
@@ -444,10 +450,6 @@ Section "!Install Files"
 
 	SetOutPath "$INSTDIR\sources"
 	File /a `${X264_SOURCE_PATH}\sources\*.tar`
-
-	SetOutPath "$INSTDIR"
-	File /a `${X264_SOURCE_PATH}\*.dll`
-	File /a `${X264_SOURCE_PATH}\*.txt`
 SectionEnd
 
 Section "-Write Uinstaller"
@@ -475,9 +477,9 @@ Section "-Create Shortcuts"
 		!insertmacro GetExecutableName $R0
 		
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\License.txt"
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\History.txt"
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\ReadMe.txt"
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\LICENSE.txt"
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\HISTORY.txt"
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\README.html"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 		
 		!insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\MuldeR's Homepage.url" "${MyWebSite}"
@@ -665,5 +667,5 @@ FunctionEnd
 
 Function ShowReadmeFunction
 	!insertmacro DisableNextButton $R0
-	${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\ReadMe.txt" "open" ""
+	${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\README.html" "open" ""
 FunctionEnd
diff --git a/src/version.h b/src/version.h
index cbbc185..fa9906f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 4
 #define VER_X264_PATCH 1
-#define VER_X264_BUILD 882
+#define VER_X264_BUILD 883
 
 #define VER_X264_PORTABLE_EDITION (0)
 
-- 
2.11.0