mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix fingerprint path with system libextextcat

Browse Source 
We want the right path in instdir already. Setting it during
installation is too late.

Change-Id: I3f7045ce4b4d3cb1f0dfac1c4fcd036db847621d
This commit is contained in:
David Tardon
2015-06-15 19:50:44 +02:00
parent 62b751aa4b
commit 5a2010ddb4
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
postprocess/CustomTarget_registry.mk
View File

@@ -566,6 +566,7 @@ postprocess_main_SED := \
-e 's,$${STARTCENTER_INFO_URL},https://www.libreoffice.org/,g' \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
$(call gb_XcdTarget_get_target,main.xcd) : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)

1
solenv/bin/modules/installer/ziplist.pm
View File

@@ -839,7 +839,6 @@ sub add_variables_to_allvariableshashref
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
$variableshashref->{'SYSTEM_LIBEXTTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} ne "" );
}
1;