diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-03-12 08:34:35 -0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-14 09:51:48 +0100 |
| commit | 770c0c1746b5c0b94dc07d5f1d6c2c04802c8540 (patch) | |
| tree | 3634144a257a554182a331a72d66c47ee3a2344b /GeneratedPackage_html_media.mk | |
| parent | 05d4e9fb471224b6adbc174ecb7968ffa29d4a56 (diff) | |
tdf#116296 remove produt version from help path
Part two.
Part 1 is in sfx2 module
Remove product version from offline help path but keep
in online help.
Product version is kept for online because a help server can have more
than one helponline version.
Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d
Reviewed-on: https://gerrit.libreoffice.org/51126
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'GeneratedPackage_html_media.mk')
| -rw-r--r-- | GeneratedPackage_html_media.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/GeneratedPackage_html_media.mk b/GeneratedPackage_html_media.mk index bb40758518..cfc526b4e6 100644 --- a/GeneratedPackage_html_media.mk +++ b/GeneratedPackage_html_media.mk @@ -9,10 +9,10 @@ # $(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_media,$(SRCDIR))) -$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/icon-themes,icon-themes/galaxy)) +$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),)/media/icon-themes,icon-themes/galaxy)) -$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/helpimg,helpcontent2/source/media/helpimg)) -$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/navigation,helpcontent2/source/media/navigation)) -$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/screenshots,helpcontent2/source/media/screenshots)) +$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),)/media/helpimg,helpcontent2/source/media/helpimg)) +$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),)/media/navigation,helpcontent2/source/media/navigation)) +$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),)/media/screenshots,helpcontent2/source/media/screenshots)) # vim: set noet sw=4 ts=4: |