diff options
author | David Tardon <dtardon@redhat.com> | 2018-04-15 12:30:53 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2018-04-15 13:49:53 +0200 |
commit | 1be0d0cddd3571f8bb8bc590e0e22a3a092ca2d7 (patch) | |
tree | 8675a881cfdf6ea7da660682e8c37e9ccfee21de | |
parent | 9709309557dfb134e2efccc34ee72c0800aa92e7 (diff) |
use the standard name pattern for a package
Change-Id: Ie9113403bb87543816220c84e53bf8b30673b194
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | reportbuilder/Module_reportbuilder.mk | 2 | ||||
-rw-r--r-- | reportbuilder/Package_templates.mk (renamed from reportbuilder/Package_reportbuilder-templates.mk) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 69bcdae4d396..8310a842eb96 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1000,7 +1000,7 @@ $(eval $(call gb_Helper_register_packages_for_install,pdfimport, \ endif $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\ - reportbuilder-templates \ + reportbuilder_templates \ )) $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index aaa3e596e845..4f554301d271 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) ifeq ($(ENABLE_REPORTBUILDER),TRUE) $(eval $(call gb_Module_add_targets,reportbuilder,\ Jar_reportbuilder \ - Package_reportbuilder-templates \ + Package_templates \ )) endif diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_templates.mk index 9f137763198f..570c1f880514 100644 --- a/reportbuilder/Package_reportbuilder-templates.mk +++ b/reportbuilder/Package_templates.mk @@ -12,9 +12,9 @@ # Package instead of an AllLangPackage (whose content would need to go into a # language pack in scp2) for now. -$(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder/template)) +$(eval $(call gb_Package_Package,reportbuilder_templates,$(SRCDIR)/reportbuilder/template)) -$(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,$(LIBO_SHARE_FOLDER)/template, \ +$(eval $(call gb_Package_add_files_with_dir,reportbuilder_templates,$(LIBO_SHARE_FOLDER)/template, \ common/wizard/report/default.otr \ )) |