From 556198b74eecf7e9f7105a792a33bf699cff6507 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 20 Jul 2011 16:22:11 +0200
Subject: Installer: installation of fonts is optional now

---
 xorg-server/installer/vcxsrv.nsi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'xorg-server/installer')

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
@@ -196,6 +194,16 @@ end:
 !endif
 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
-- 
cgit v1.2.3