From: rdw <rdw@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Sat, 25 May 2013 13:55:58 +0000 (+0000)
Subject: Set up a default INSTALLDIR.
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=79690010c4552fedf7082875a10596e5f008524c

Set up a default INSTALLDIR.

Various scripts fail horribly without this - most notably the editing script, but also keygen.
This only get provoked by a GUI-less install but should work anyway.

Hard wire the default to be C:\opt\shibboleth-sp\ Unfortunately we have to hardwire the dos device
since symbol exampansion does not work, and without a dos device we wonder off into network territory.



git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3857 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 0e16c28..de75897 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -39,6 +39,8 @@
   <Property Id='ALWAYS_START_SERVICE' Value='TRUE' Secure='yes' />
 
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
+  <!-- SSPCPP-568 We need a default for InstallDir -->
+  <Property Id='INSTALLDIR' Value='C:\opt\shibboleth-sp'/>
   <!-- IISMAJORVERSION if IIS installed -->
   <PropertyRef Id='IISMAJORVERSION' />