Repository.mk | 2 +-
extras/Module_extras.mk | 2 +-
extras/Package_tplpresnt.mk | 9 +++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e393a739fa890aeb77f189b62de4356043211490
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Nov 26 16:33:49 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Nov 27 09:32:52 2024 +0100
for --without-templates still generate the template/common/presnt dir
but leave it empty
Change-Id: Ie7f95f6d01c669598305e24472c357c1b92ad1f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177353
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Rashesh Padia <rashesh.pa...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index 5a3cec7c266a..711fa53d6380 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -965,10 +965,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 07055820e9fc..99bce25c04fe 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_labels \
$(if $(filter WNT,$(OS)),Package_newfiles) \
Package_palettes \
+ Package_tplpresnt \
Package_tplwizdesktop \
Package_wordbook \
))
@@ -54,7 +55,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 34f20f61fcf5..4e12f6d1906f 100644
--- a/extras/Package_tplpresnt.mk
+++ b/extras/Package_tplpresnt.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,extras_tplpresnt,$(call
gb_CustomTarget_get_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:
