msc-externals: remove Package_msms, use MSM directly from MSVC dir

Change-Id: I2e35810312ed140e393311569de7abd6f4676b63

1 files changed, 3 insertions, 3 deletions

diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index ee02abb2e439..3989e26e408b 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -75,10 +75,10 @@ sub merge_mergemodules_into_msi_database
             foreach $mergemodule ( @{$mergemodules} )
             {
                 my $filename = $mergemodule->{'Name'};
-                my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
+                my $mergefile = $ENV{'MSM_PATH'} . $filename;
 
-                if ( ! -f $$mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "merge_mergemodules_into_msi_database"); }
-                my $completesource = $$mergefile;
+                if ( ! -f $mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename ($mergefile)!", "merge_mergemodules_into_msi_database"); }
+                my $completesource = $mergefile;
 
                 my $mergegid = $mergemodule->{'gid'};
                 my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid;