diff options
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | scp2/macros/macro.pl | 8 | ||||
| -rw-r--r-- | solenv/gbuild/AllLangPackage.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 2 |
6 files changed, 16 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 01c51c7a9db0..6ef05911a1bd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -954,8 +954,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \ $(if $(ENABLE_HTMLHELP),\ helpcontent2_html_dynamic \ - helpcontent2_html_lang \ - helpcontent2_html_lang_generated \ helpcontent2_html_media \ helpcontent2_html_static \ ) \ diff --git a/configure.ac b/configure.ac index 56e9b01811a4..e57333f7963c 100644 --- a/configure.ac +++ b/configure.ac @@ -4715,6 +4715,7 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Androi ;; "html") ENABLE_HTMLHELP=TRUE + SCPDEFS="$SCPDEFS -DWITH_HELP" AC_MSG_RESULT([HTML]) ;; "online") diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index b94b7c330e40..afc8631cfd3a 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -80,7 +80,7 @@ LibreOffice downloadname LibreOffice_{productversion}_{os}_install_{languages} langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} - include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} } } @@ -133,7 +133,7 @@ LibreOfficeDev downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} - include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} } } diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index aa03d4e04b9f..7f54298f9a3e 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -188,11 +188,17 @@ sub write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; + my $source; + if ($ENV{'ENABLE_HTMLHELP'} eq 'TRUE') { + $source = 'html-help'; # found in instsetoo_native/util/openoffice.lst.in's {filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists + } else { + $source = 'HelpTarget'; + } print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) "; foreach $lang (@helplangs) { print OUTFILE ";" unless $first; $first = 0; - print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME(HelpTarget/,name,/$lang)"; + print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME($source/,name,/$lang)"; } print OUTFILE "\n\n"; } diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk index 8a691cdc1018..6076a83bccb0 100644 --- a/solenv/gbuild/AllLangPackage.mk +++ b/solenv/gbuild/AllLangPackage.mk @@ -108,4 +108,9 @@ $(foreach lang,$(gb_AllLangPackage_LANGS),$(call gb_Package_use_unpacked,$(1)_$( endef +define gb_AllLangPackage_use_customtarget +$(foreach lang,$(gb_AllLangPackage_LANGS),$(call gb_Package_use_customtarget,$(1)_$(lang),$(2))) + +endef + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 58bb552c6694..821ed59ff68c 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -555,7 +555,7 @@ $(dir $(call gb_HelpTarget_get_target,%))%/.dir : # Translation of the module's .xhp files and all used modules is done. # Also creates the list for gb_HelpTarget_get_filelist. $(call gb_HelpTarget_get_translation_target,%) : - rm -f $@ && mv $(call var2file,$@.tmp,100,$(HELP_FILES)) $@ + rm -f $@ && mv $(call var2file,$@.tmp,100,$(strip $(HELP_FILES))) $@ # Translation of the module's .xhp files and all used and linked modules # is done. |