diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-04-06 05:06:17 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2012-04-06 05:06:17 +0000 |
| commit | acb2b244966aeec7fde2f0d819815c5c8a493fab (patch) | |
| tree | 065259d784d53982b42fc58ffda91cf5b3f57fcd /solenv | |
| parent | 88ddbaf80e37c3083692163b1d4688cf9cab074f (diff) | |
#i119168# use generic LICENSE file for langpacks and sdks
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/languagepack.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index e2a16e81ae2d..513e1e45dbb3 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -193,7 +193,7 @@ BEGIN %alllangmodules = (); $englishlicenseset = 0; $englishlicense = ""; - $englishsolarislicensename = "LICENSE_en-US"; + $englishsolarislicensename = "LICENSE"; $solarisdontcompress = 0; $patharray = ""; diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm index ec90ff80cfdb..461bbc9a33dd 100644 --- a/solenv/bin/modules/installer/languagepack.pm +++ b/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); diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 4162677cd917..91da2ab0b39a 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/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); |