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

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

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) {