diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-08 21:04:27 +0000 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 20:16:28 +0100 |
| commit | af710fabc0833dac7df4d9d92325efe4016a9f63 (patch) | |
| tree | 117aa3f8af4fd287f97af8b74fb98ab10c73a973 /solenv | |
| parent | e2d484687778989f6642e4f0054229b6574d37e6 (diff) | |
cleanup hard-coded license mentions in sdk and installer
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/javainstaller.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 1ae206346910..eb8ff535f03a 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"; $solarisdontcompress = 0; $patharray = ""; diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm index ebc7b440de8f..d9a0d880f385 100644 --- a/solenv/bin/modules/installer/javainstaller.pm +++ b/solenv/bin/modules/installer/javainstaller.pm @@ -274,7 +274,7 @@ sub get_licensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "LICENSE_" . $language; + my $licensefilename = "LICENSE"; # . '_' . $language; my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 0); if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "get_licensefilesource"); } |