[WIX] simplify by creating %systemdrive%\DAT in a single place (moved from ofed.wxs...

Create DAT SDK include file to match uDAT ver 2 conventions (DAT --> DAT2)
Include missing DAT file dat_ib_extensions.h

git-svn-id: svn://openib.tc.cornell.edu/gen1@2772 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/OFED/WIX/common/DAT_config.inc b/trunk/OFED/WIX/common/DAT_config.inc
index dd78e2cdee7fcd8541cc37673b262d3c8ef5b53f..becd63926f47f1bb5a3e3e68f954f93c01176954 100644 (file)
--- a/trunk/OFED/WIX/common/DAT_config.inc
+++ b/trunk/OFED/WIX/common/DAT_config.inc
@@ -1,4 +1,9 @@
 <Include>\r
+\r
+  <Directory Id="dDATD" Name="DAT">\r
+ \r
+    <!-- install DAT configuration file to %SystemDrive%\DAT\ -->\r
+\r
     <Component Id="cDatCfg"\r
                Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
       <CreateFolder />\r
@@ -7,13 +12,15 @@
              Source="..\..\dat.conf" />\r
     </Component>\r
 \r
+    <!-- Install DAT header files to %SystemDrive%\DAT\v2-0\DAT2 -->\r
+\r
     <Directory Id="v2_0" Name="v2-0">\r
       <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"\r
                  KeyPath="yes" SharedDllRefCount="yes">\r
         <CreateFolder />\r
       </Component>\r
 \r
-      <Directory Id="DDID2" Name="DAT">    \r
+      <Directory Id="DDID2" Name="DAT2">    \r
         <Component Id="cDatBldV2Hdrs"\r
                   Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
           <CreateFolder />    \r
@@ -25,6 +32,10 @@
                 Name="dat_error.h"\r
                 Source="..\bin\DAPL2\dat_error.h" />    \r
   \r
+          <File Id="_dat_ib_extensions.h" DiskId="1"    \r
+                Name="dat_ib_extensions.h"\r
+                Source="..\bin\DAPL2\dat_ib_extensions.h" />    \r
+  \r
           <File Id="_dat_platform_specific.h"    \r
                 DiskId="1" Name="dat_platform_specific.h"    \r
                 Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
@@ -70,4 +81,7 @@
                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
       </Component>\r
     </Directory>\r
+\r
+  </Directory>\r
+\r
 </Include>\r