diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-10-29 13:12:32 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-10-29 13:17:36 -0700 |
| commit | 34f6b1233a996886ca2cc15ab0d66146ca5b4c96 (patch) | |
| tree | 0235c524166b9656d793b4a7edb01d2cfda540c0 | |
| parent | 7fea21dc92e9c187c83850b8da1470c164813dbd (diff) | |
Collabora EULA integration to 4.1 build system
Change-Id: I0c5bf15762a67dc629b35c7d07a90c87e722a20d
| -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"; |