aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-20 16:22:11 +0200
committermarha <marha@users.sourceforge.net>2011-07-20 16:22:11 +0200
commit556198b74eecf7e9f7105a792a33bf699cff6507 (patch)
tree301b3ea4688953449f0cc961b47e4d343a1e06d3
parent65de5cf5e6d4f758c47775eb6a086c4810253873 (diff)
downloadvcxsrv-556198b74eecf7e9f7105a792a33bf699cff6507.tar.gz
vcxsrv-556198b74eecf7e9f7105a792a33bf699cff6507.tar.bz2
vcxsrv-556198b74eecf7e9f7105a792a33bf699cff6507.zip
Installer: installation of fonts is optional now
-rw-r--r--xorg-server/installer/vcxsrv.nsi12
1 files changed, 10 insertions, 2 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 080784820..8ba22aa46 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -101,8 +101,6 @@ Section "VcXsrv (required)"
File "msvcp100.dll"
File "msvcr100d.dll"
!endif
- SetOutPath $INSTDIR\fonts
- File /r "..\fonts\*.*"
SetOutPath $INSTDIR\xkbdata
File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
@@ -197,6 +195,16 @@ end:
SectionEnd
; Optional section (can be disabled by the user)
+Section "Fonts"
+ SectionIn 1
+
+ SetOutPath $INSTDIR\fonts
+ CreateDirectory "$SMPROGRAMS\VcXsrv"
+ File /r "..\fonts\*.*"
+
+SectionEnd
+
+; Optional section (can be disabled by the user)
Section "Start Menu Shortcuts"
SectionIn 1