Anchor various GUI entities and the merge modules so the build stops being tied to...

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-gui.wxs

diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index fde8f37..8f19527 100644 (file)
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -16,13 +16,15 @@
      implied.  See the License for the specific language governing\r
      permissions and limitations under the License.  -->\r
 \r
+<?include Versions.wxi ?>\r
+\r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->\r
   <Fragment>\r
 \r
-    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />\r
-    <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />\r
-    <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />\r
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\license.rtf" />\r
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\TopBanner.bmp" />\r
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\Dialog.bmp" />\r
     <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    \r
 \r
     <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in\r