STABLE14-windows-wix-docs-20050926

Match the documentation location of the NSIS installer.

(cherry picked from commit a1e9273ded1993c528576102fca290663854e0c8)

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 14be601f6b03eb7b4b9e6ffb94a9742402a9c858..169fcf1cf692257c05fa63a5618cc68a6331b375 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -380,7 +380,6 @@
 
             <Directory Id="dirDocumentation" Name="Docum" LongName="Documentation" SourceName="Docs">
                                <!-- The following directory and everything below it is language dependent. -->
-                <Directory Id="dirDoc_$(var.Language)" Name="$(var.Language)">
                     <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
                         <Component Id="cmf_index2_HTM_$(var.Language)" Guid="$(var.DocHtmlIndexGuid)">
                             <File Id="fileindex2_HTM_$(var.Language)" Name="index.htm" LongName="index.htm" KeyPath="yes" DiskId="1">
@@ -770,7 +769,6 @@
                             </Directory> <!-- logo_files -->
                         </Directory> <!-- Release Notes -->
                     </Directory> <!-- Html -->
-                </Directory> <!-- $(var.Language) -->
             </Directory> <!-- Documentation -->
 
             <Directory Id="dirClient" Name="Client">