diff options
| author | David Tardon <dtardon@redhat.com> | 2015-06-15 19:50:44 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-06-15 21:16:25 +0200 |
| commit | 5a2010ddb4d604c289ad2d6b74b54c10bc87bafc (patch) | |
| tree | 75a4e0363705688d8b6248d91cb7e631e8e8f331 | |
| parent | 62b751aa4bbe7cb4420f5f3523b0ab9f7602d5f9 (diff) | |
fix fingerprint path with system libextextcat
We want the right path in instdir already. Setting it during
installation is too late.
Change-Id: I3f7045ce4b4d3cb1f0dfac1c4fcd036db847621d
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 35de59e5ba11..56818895d8f7 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -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) diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 9f31455bcd47..0c5eb2a23a50 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -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; |