diff options
| -rw-r--r-- | readlicense_oo/Package_files.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/idtglobal.pm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index b084634d0575..466b6fb59522 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -23,4 +23,6 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDI $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/EULA_en-US.rtf,eula/EULA_en-US.rtf)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 8cbfcb24b2b8..d3f325148f82 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -813,10 +813,9 @@ sub get_rtflicensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "license_" . $language . ".rtf"; + my $licensefilename = "EULA_en-US.rtf"; my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1); - if ($$sourcefileref eq "") { installer::exiter::exit_program("ERROR: Could not find $licensefilename!", "get_rtflicensefilesource"); } my $infoline = "Using licensefile: $$sourcefileref\n"; |