lang-specific license files are not longer available

fix installer to use LICENSE/license.txt instead

5 files changed, 7 insertions, 7 deletions

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index f86d224b1f36..769e02d6ed4f 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -405,12 +405,12 @@ sub create_epm_header
     {
         if ( $installer::globals::iswindowsbuild )
         {
-            $licensefilename = "license_$searchlanguage.txt";
+            $licensefilename = "license.txt"; # _$searchlanguage.txt";
             $readmefilename = "readme_$searchlanguage.txt";
         }
         else
         {
-            $licensefilename = "LICENSE_$searchlanguage";
+            $licensefilename = "LICENSE"; # _$searchlanguage";
             $readmefilename = "README_$searchlanguage";
         }
     }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index ca5f67f8bb00..19f039cf0b0f 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -190,7 +190,7 @@ BEGIN
     %alllangmodules = ();
     $englishlicenseset = 0;
     $englishlicense = "";
-    $englishsolarislicensename = "LICENSE_en-US";
+    $englishsolarislicensename = "LICENSE"; # _en-US";
     $solarisdontcompress = 0;
     $patharray = "";
 
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
index a1f209c74f15..f4d795a6660e 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -490,7 +490,7 @@ sub build_installer_for_helppack
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    my $licensefilename = "LICENSE_" . $licenselanguage;
+    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
     my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 7d3e0f6aca0e..812ae702c03c 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -519,7 +519,7 @@ sub build_installer_for_languagepack
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    my $licensefilename = "LICENSE_" . $licenselanguage;
+    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
     my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 9efc264618f4..099227930af2 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -3157,8 +3157,8 @@ sub put_license_into_setup
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    # my $licensefilename = "LICENSE_" . $licenselanguage;
-    my $licensefilename = "license_" . $licenselanguage . ".txt";
+    # my $licensefilename = "LICENSE"; # _" . $licenselanguage;
+    my $licensefilename = "license"; # . $licenselanguage . ".txt";
     my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);