diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 15:04:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 15:12:21 +0200 |
| commit | 64bb1203851bc92fd5ee2acaf0d4c4babf7a6180 (patch) | |
| tree | d7370ff77e831444c3417d633ef7b4688ae30b50 | |
| parent | f10b89e1d34ab5faca7c4121dc9d1389617d1ba5 (diff) | |
Avoid name clash between Package and GeneratedPackage htmlcontent2_html
...by renaming the latter to htmlcontent2_html_generated. The name clash
happened to not cause trouble yet, but would once these packages are added to
installation sets (i.e., once both would want to occur in
gb_Helper_register_packages_for_install lists in Repository.mk).
(Also do some minor syntactic clean up.)
Change-Id: I009c154d3bb06312a9f4224b2d5feb1d9f6689fc
Reviewed-on: https://gerrit.libreoffice.org/53208
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | GeneratedPackage_html_generated.mk (renamed from GeneratedPackage_html.mk) | 6 | ||||
| -rw-r--r-- | Module_helpcontent2.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/GeneratedPackage_html.mk b/GeneratedPackage_html_generated.mk index 36b4e6edf7..04e59c2856 100644 --- a/GeneratedPackage_html.mk +++ b/GeneratedPackage_html_generated.mk @@ -7,12 +7,12 @@ # # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # # -$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) +$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_generated,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) -$(eval $(call gb_GeneratedPackage_use_customtarget,helpcontent2_html,helpcontent2/help3xsl)) +$(eval $(call gb_GeneratedPackage_use_customtarget,helpcontent2_html_generated,helpcontent2/help3xsl)) $(eval $(foreach lang,$(gb_HELP_LANGS),\ -$(call gb_GeneratedPackage_add_dir,helpcontent2_html,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),)/$(lang)/text,$(lang)/text) \ +$(call gb_GeneratedPackage_add_dir,helpcontent2_html_generated,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/$(lang)/text,$(lang)/text) \ )) # vim: set noet sw=4 ts=4: diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk index 8ff89344fb..3e69742f96 100644 --- a/Module_helpcontent2.mk +++ b/Module_helpcontent2.mk @@ -18,7 +18,7 @@ ifeq ($(ENABLE_HTMLHELP),TRUE) $(eval $(call gb_Module_add_targets,helpcontent2,\ CustomTarget_html \ GeneratedPackage_html_media \ - GeneratedPackage_html \ + GeneratedPackage_html_generated \ Package_html_static \ Package_html \ )) |