#i119168# use generic LICENSE file for langpacks and sdks

scp2/source/sdkoo/sdkoo.scp

@@ -93,14 +93,14 @@ End
 
 #if defined MACOSX
 ScpAction scp_Copy_License_Txt_Sdk
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
+    Copy = "LICENSE";
+    Name = "LICENSE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End
 ScpAction scp_Copy_Notice_Txt_Sdk
-    README_ALL_LANG(Copy, NOTICE);
-    README_ALL_LANG(Name, NOTICE);
+    Copy = "NOTICE";
+    Name = "NOTICE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End

solenv/bin/modules/installer/globals.pm

@@ -193,7 +193,7 @@ BEGIN
     %alllangmodules = ();
     $englishlicenseset = 0;
     $englishlicense = "";
-    $englishsolarislicensename = "LICENSE_en-US";
+    $englishsolarislicensename = "LICENSE";
     $solarisdontcompress = 0;
     $patharray = "";
 

solenv/bin/modules/installer/languagepack.pm

@@ -515,7 +515,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";
     my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);

solenv/bin/modules/installer/worker.pm

@@ -3126,10 +3126,10 @@ sub put_license_into_setup
 {
     my ($installdir, $includepatharrayref) = @_;
 
-    # find and read english license file
+    # find and read the license file
     my $licenselanguage = "en-US";                  # always english !
-    # my $licensefilename = "LICENSE_" . $licenselanguage;
-    my $licensefilename = "license_" . $licenselanguage . ".txt";
+    my $licensefilename = "LICENSE";
+#   my $licensefilename = "LICENSE" . ".txt";
     my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);