diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 11:31:58 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 11:50:24 +0200 |
| commit | fdb6b39d682372ece754afee2d574ab31552f36b (patch) | |
| tree | 03b94258fea78d409661e988f081030aea317151 | |
| parent | 06575c858de25850c54aaeb9d671bebccb73cdaf (diff) | |
fix installing for --enable-mergelibs
Use gid_File_Lib_Oox instead of auto_File_Lib_vcl which is not defined
in that case.
No idea what the code is about though.
Change-Id: I675268a3490dd1421ecf1a82ede0db527d176744
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/profiles.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 60e402fa8df3..61d295b0691e 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -64,7 +64,7 @@ LibreOffice PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEREVISION {buildid} LICENSENAME LGPL - GLOBALFILEGID auto_File_Lib_vcl + GLOBALFILEGID gid_File_Lib_Oox GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt OOODOWNLOADNAME 1 @@ -120,7 +120,7 @@ LibreOffice_Dev PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEREVISION {buildid} LICENSENAME LGPL - GLOBALFILEGID auto_File_Lib_vcl + GLOBALFILEGID gid_File_Lib_Oox GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt OOODOWNLOADNAME 1 diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm index b83b69653dfd..5dadf809a457 100644 --- a/solenv/bin/modules/installer/profiles.pm +++ b/solenv/bin/modules/installer/profiles.pm @@ -84,9 +84,9 @@ sub add_profile_into_filelist my %profile = (); - # Taking the base data from the "auto_File_Lib_vcl" + # Taking the base data from the "gid_File_Lib_Oox" - my $vclgid = "auto_File_Lib_vcl"; + my $vclgid = "gid_File_Lib_Oox"; if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; } my ($vclfile) = grep {$_->{gid} eq $vclgid} @{$filesarrayref}; if (! defined $vclfile) { |