Index: hw/mlx4/kernel/hca/mlx4_hca.inf
===================================================================
--- hw/mlx4/kernel/hca/mlx4_hca.inf	(revision 1131)
+++ hw/mlx4/kernel/hca/mlx4_hca.inf	(working copy)
@@ -16,11 +16,11 @@
 ;*****************************************
 
 [DestinationDirs]
-DefaultDestDir = 12
-Wdf_CoInstaller_CopyFiles = 11
-ClassCopyFiles = 11
-MLX4HCA.UMCopyFiles = 11
-MLX4HCA.WOW64CopyFiles = 16425
+DefaultDestDir = %DIRID_DRIVERS%
+ClassCopyFiles = %DIRID_SYSTEM%
+MLX4HCA.UMCopyFiles = %DIRID_SYSTEM%
+MLX4HCA.WOW64CopyFiles = %DIRID_SYSTEM_X86%
+;Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%
 
 ;*****************************************
 ; Class Install section
@@ -54,14 +54,14 @@
 1=%DiskId%,,,""
 
 [SourceDisksFiles.x86]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
 ;wdfcoinstaller01005.dll = 1,,
 
 [SourceDisksFiles.amd64]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
@@ -70,7 +70,7 @@
 ;wdfcoinstaller01005.dll = 1,,
 
 [SourceDisksFiles.ia64]
-IbInstaller.dll=1
+IbInstaller.dll = 1,,
 mlx4_hca.sys = 1,,
 mlx4u.dll = 1,,
 mlx4ud.dll = 1,,
@@ -220,3 +220,6 @@
 SERVICE_ERROR_NORMAL   = 1
 REG_DWORD              = 0x00010001
 REG_MULTI_SZ_APPEND    = 0x00010008
+DIRID_SYSTEM           = 11
+DIRID_DRIVERS          = 12
+DIRID_SYSTEM_X86       = 16425