[quake3-commits] r1797 - trunk/misc/nsis

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2010-10-12 02:27:27 -0400 (Tue, 12 Oct 2010)
New Revision: 1797

Modified:
   trunk/misc/nsis/ioquake3.nsi.in
Log:
uninstall zlib1.dll, disable description panel (bug 4779)

Modified: trunk/misc/nsis/ioquake3.nsi.in
===================================================================
--- trunk/misc/nsis/ioquake3.nsi.in	2010-09-01 11:50:09 UTC (rev 1796)
+++ trunk/misc/nsis/ioquake3.nsi.in	2010-10-12 06:27:27 UTC (rev 1797)
@@ -44,7 +44,8 @@
 ;Pages
 
 !insertmacro MULTIUSER_PAGE_INSTALLMODE
-#!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
+;!insertmacro MUI_PAGE_LICENSE "../../COPYING.txt"
+!define MUI_COMPONENTSPAGE_NODESC
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -83,7 +84,7 @@
   File "../../build/release-mingw32-x86/ioq3ded.x86.exe"
   File "../../build/release-mingw32-x86/ioquake3.x86.exe"
   File "../../COPYING.txt"
-  File "../../README.txt"
+  File "/oname=README.txt" "../../README"
   File "../../id-readme.txt"
   File "../../voip-readme.txt"
 
@@ -167,6 +168,8 @@
   Delete $INSTDIR\id-readme.txt
   Delete $INSTDIR\voip-readme.txt
 
+  Delete $INSTDIR\zlib1.dll
+
   Delete $INSTDIR\SDL.dll
 
   Delete $INSTDIR\libcurl-4.dll