diff --git a/Repository.mk b/Repository.mk index c90c56880147..fc2e071ccc26 100644 --- a/Repository.mk +++ b/Repository.mk @@ -981,10 +981,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ extras_persona_pink \ extras_persona_sand \ extras_persona_white \ + extras_tplpresnt \ extras_tplwizdesktop \ $(if $(WITH_TEMPLATES),\ extras_templates \ - extras_tplpresnt \ extras_tplwizbitmap \ extras_tplwizard \ ) \ diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 0c04202e8a20..f78c226cd401 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_labels \ $(if $(filter WNT,$(OS)),Package_newfiles) \ Package_palettes \ + Package_tplpresnt \ Package_tplwizdesktop \ Package_wordbook \ )) @@ -51,7 +52,6 @@ endif ifneq ($(WITH_TEMPLATES),) $(eval $(call gb_Module_add_targets,extras,\ Package_templates \ - Package_tplpresnt \ Package_tplwizard \ Package_tplwizbitmap \ )) diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk index cb3cf2562245..a9e0b723cbf8 100644 --- a/extras/Package_tplpresnt.mk +++ b/extras/Package_tplpresnt.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt)) +ifneq ($(WITH_TEMPLATES),) + $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ Candy.otp \ DNA.otp \ @@ -35,4 +37,11 @@ $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/templat Yellow_Idea.otp \ )) +else + +# For without-templates, still include the empty directory +$(eval $(call gb_Package_add_empty_directory,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt)) + +endif + # vim: set noet sw=4 ts=4: