Further work on the "Mac-like app structure" option

Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4

RepositoryExternal.mk

@@ -3038,7 +3038,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
 
 else
 
-$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/program/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
+$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
 $(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND))
 $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
 

afms/ExternalPackage_fontunxafm.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
 
 $(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,share/psprint/fontmetric,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\
 	Courier-Bold.afm \
 	Courier-BoldOblique.afm \
 	Courier-Oblique.afm \

config_host.mk.in

@@ -304,8 +304,14 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
 export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
+export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@
+export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@
+export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@
 export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
+export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
+export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
 export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
+export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
 export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@

config_host/config_folders.h.in

@@ -23,9 +23,15 @@
 /* where read-only resources are in general */
 #undef LIBO_SHARE_FOLDER
 
+/* where help files are */
+#undef LIBO_SHARE_HELP_FOLDER
+
 /* where java jars are */
 #undef LIBO_SHARE_JAVA_FOLDER
 
+/* the presets folder */
+#undef LIBO_SHARE_PRESETS_FOLDER
+
 /* LO's own "resources" */
 #undef LIBO_SHARE_RESOURCE_FOLDER
 

configure.ac

@@ -2866,7 +2866,10 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes;
     LIBO_LIBEXEC_FOLDER=MacOS
     LIBO_LIB_FOLDER=Frameworks
     LIBO_SHARE_FOLDER=Resources
+    LIBO_SHARE_HELP_FOLDER=Resources/help
     LIBO_SHARE_JAVA_FOLDER=Resources/java
+    LIBO_SHARE_PRESETS_FOLDER=Resources/presets
+    LIBO_LIB_PYUNO_FOLDER=Resources
     LIBO_SHARE_RESOURCE_FOLDER=Resources/resource
     LIBO_SHARE_SHELL_FOLDER=Resources/shell
     LIBO_URE_BIN_FOLDER=MacOS
@@ -2876,13 +2879,33 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes;
     LIBO_URE_SHARE_JAVA_FOLDER=Resources/java
     ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES
     AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
+elif test $_os = Darwin; then
+    LIBO_BIN_FOLDER=program
+    LIBO_ETC_FOLDER=program
+    LIBO_LIBEXEC_FOLDER=program
+    LIBO_LIB_FOLDER=program
+    LIBO_LIB_PYUNO_FOLDER=program
+    LIBO_SHARE_FOLDER=share
+    LIBO_SHARE_HELP_FOLDER=help
+    LIBO_SHARE_JAVA_FOLDER=program/classes
+    LIBO_SHARE_PRESETS_FOLDER=presets
+    LIBO_SHARE_RESOURCE_FOLDER=program/resource
+    LIBO_SHARE_SHELL_FOLDER=program/shell
+    LIBO_URE_BIN_FOLDER=ure-link/bin
+    LIBO_URE_ETC_FOLDER=ure-link/bin
+    LIBO_URE_LIB_FOLDER=ure-link/lib
+    LIBO_URE_SHARE_FOLDER=ure-link/share
+    LIBO_URE_SHARE_JAVA_FOLDER=ure-link/share/java
 elif test $_os = WINNT; then
     LIBO_BIN_FOLDER=program
     LIBO_ETC_FOLDER=program
     LIBO_LIBEXEC_FOLDER=program
     LIBO_LIB_FOLDER=program
+    LIBO_LIB_PYUNO_FOLDER=program
     LIBO_SHARE_FOLDER=share
+    LIBO_SHARE_HELP_FOLDER=help
     LIBO_SHARE_JAVA_FOLDER=program/classes
+    LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_RESOURCE_FOLDER=program/resource
     LIBO_SHARE_SHELL_FOLDER=program/shell
     LIBO_URE_BIN_FOLDER=ure-link/bin
@@ -2895,8 +2918,11 @@ else
     LIBO_ETC_FOLDER=program
     LIBO_LIBEXEC_FOLDER=program
     LIBO_LIB_FOLDER=program
+    LIBO_LIB_PYUNO_FOLDER=program
     LIBO_SHARE_FOLDER=share
+    LIBO_SHARE_HELP_FOLDER=help
     LIBO_SHARE_JAVA_FOLDER=program/classes
+    LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_RESOURCE_FOLDER=program/resource
     LIBO_SHARE_SHELL_FOLDER=program/shell
     LIBO_URE_BIN_FOLDER=ure/bin
@@ -2909,8 +2935,11 @@ AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_ETC_FOLDER,"$LIBO_ETC_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_LIBEXEC_FOLDER,"$LIBO_LIBEXEC_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_LIB_FOLDER,"$LIBO_LIB_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_LIB_PYUNO_FOLDER,"$LIBO_LIB_PYUNO_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_FOLDER,"$LIBO_SHARE_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_SHARE_HELP_FOLDER,"$LIBO_SHARE_HELP_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_JAVA_FOLDER,"$LIBO_SHARE_JAVA_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_SHARE_PRESETS_FOLDER,"$LIBO_SHARE_PRESETS_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_RESOURCE_FOLDER,"$LIBO_SHARE_RESOURCE_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_SHELL_FOLDER,"$LIBO_SHARE_SHELL_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_URE_BIN_FOLDER,"$LIBO_URE_BIN_FOLDER")
@@ -2921,8 +2950,14 @@ AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_JAVA_FOLDER,"$LIBO_URE_SHARE_JAVA_FOLDER")
 
 # Not all of them needed in config_host.mk, add more if need arises
 AC_SUBST(LIBO_BIN_FOLDER)
+AC_SUBST(LIBO_ETC_FOLDER)
+AC_SUBST(LIBO_LIB_FOLDER)
+AC_SUBST(LIBO_LIB_PYUNO_FOLDER)
 AC_SUBST(LIBO_SHARE_FOLDER)
+AC_SUBST(LIBO_SHARE_HELP_FOLDER)
+AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
 AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
+AC_SUBST(LIBO_URE_LIB_FOLDER)
 AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)
 
 dnl ===================================================================

desktop/Package_branding.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
 
 $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\
     $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
 		$(if $(filter intro.png,$(image)),\
 			$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME),\
 	) \
 ))
 
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER)/shell,\
     $(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
 ))
 

desktop/source/app/userinstall.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <config_features.h>
+#include <config_folders.h>
 
 #include "sal/config.h"
 
@@ -191,7 +192,7 @@ namespace desktop {
 
         // Copy data from shared data directory of base installation:
         rc = copy_recursive(
-            aBasePath + OUString("/presets"),
+            aBasePath + OUString("/" LIBO_SHARE_PRESETS_FOLDER),
             aUserPath + OUString("/user"));
         if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST))
         {

extras/AllLangPackage_accessoriestemplates.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplates,$(call gb_Un
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplates,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,share/template,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,$(LIBO_SHARE_FOLDER)/template,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/dummy_templates.txt \

extras/AllLangPackage_accessoriestemplateseducate.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateseducate,$(cal
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateseducate,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,share/template,educate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,$(LIBO_SHARE_FOLDER)/template,educate,\
 	cs/dummy_templates.txt \
 	de/Jahres_Schulnoten.ots \
 	de/Klassen-Schulnoten-Verwaltung_Noten_1-6.ots \

extras/AllLangPackage_accessoriestemplatesfinance.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesfinance,$(cal
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesfinance,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,share/template,finance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,$(LIBO_SHARE_FOLDER)/template,finance,\
 	cs/podaci_kniha.ots \
 	de/arbeitszeiterfassung.ots \
 	de/az.ots \

extras/AllLangPackage_accessoriestemplatesforms.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesforms,$(call
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesforms,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,share/template,forms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,$(LIBO_SHARE_FOLDER)/template,forms,\
 	cs/seznam_pohledavek.ots \
 	de/Ausbildungsnachweis2.ott \
 	de/Ausbildungsnachweis.ott \

extras/AllLangPackage_accessoriestemplateslabels.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslabels,$(call
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslabels,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,share/template,labels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,$(LIBO_SHARE_FOLDER)/template,labels,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/address12-WL-OL875.ott \

extras/AllLangPackage_accessoriestemplateslayout.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslayout,$(call
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslayout,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,share/template,layout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,$(LIBO_SHARE_FOLDER)/template,layout,\
 	cs/dummy_templates.txt \
 	de/A4-kariert.otp \
 	de/BlueBoxes.otp \

extras/AllLangPackage_accessoriestemplatesmisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesmisc,$(call g
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesmisc,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,share/template,misc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,$(LIBO_SHARE_FOLDER)/template,misc,\
 	cs/dummy_templates.txt \
 	de/01_event_poster.otg \
 	de/02_event_poster.otg \

extras/AllLangPackage_accessoriestemplatesnonfree.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfree,$(cal
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfree,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,share/template,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,$(LIBO_SHARE_FOLDER)/template,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeeducat
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeeducate,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,share/template,educate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,$(LIBO_SHARE_FOLDER)/template,educate,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/attendance_sheet.ott \

extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreefinanc
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreefinance,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,share/template,finance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,$(LIBO_SHARE_FOLDER)/template,finance,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/24_Month_Sales_Forecast.ots \

extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeforms,
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeforms,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,share/template,forms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,$(LIBO_SHARE_FOLDER)/template,forms,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelabels
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelabels,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,share/template,labels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,$(LIBO_SHARE_FOLDER)/template,labels,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelayout
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelayout,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,share/template,layout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,$(LIBO_SHARE_FOLDER)/template,layout,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreemisc,$
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreemisc,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,share/template,misc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,$(LIBO_SHARE_FOLDER)/template,misc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/achievement_1.ott \

extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffico
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeofficorr,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,share/template,officorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,$(LIBO_SHARE_FOLDER)/template,officorr,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffimi
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,share/template,offimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,$(LIBO_SHARE_FOLDER)/template,offimisc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/report_1.ott \

extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeperson
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepersonal,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,share/template,personal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,$(LIBO_SHARE_FOLDER)/template,personal,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/resume_1.ott \

extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepresen
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepresent,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,share/template,presnt,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,$(LIBO_SHARE_FOLDER)/template,presnt,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \

extras/AllLangPackage_accessoriestemplatesofficorr.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesofficorr,$(ca
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesofficorr,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,share/template,officorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,$(LIBO_SHARE_FOLDER)/template,officorr,\
 	cs/dummy_templates.txt \
 	de/01_business_fax.ott \
 	de/01_business_letter.ott \

extras/AllLangPackage_accessoriestemplatesoffimisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesoffimisc,$(ca
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,share/template,offimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,$(LIBO_SHARE_FOLDER)/template,offimisc,\
 	cs/dummy_templates.txt \
 	de/01_graph_paper.ott \
 	de/01_invoice.ott \

extras/AllLangPackage_accessoriestemplatespersonal.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespersonal,$(ca
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespersonal,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,share/template,personal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,$(LIBO_SHARE_FOLDER)/template,personal,\
 	cs/dummy_templates.txt \
 	de/faltkarte.otg \
 	de/formalletteraquarius.ott \

extras/AllLangPackage_accessoriestemplatespresent.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespresent,$(cal
 
 $(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespresent,templates-pack))
 
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,share/template,presnt,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,$(LIBO_SHARE_FOLDER)/template,presnt,\
 	cs/dummy_templates.txt \
 	de/compladients.otp \
 	de/praktikumsbericht.otp \

extras/AllLangPackage_autotextshare.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
 
-$(eval $(call gb_AllLangPackage_add_files,autotextshare,share/autotext,\
+$(eval $(call gb_AllLangPackage_add_files,autotextshare,$(LIBO_SHARE_FOLDER)/autotext,\
 	bg/crdbus50.bau \
 	bg/standard.bau \
 	bg/template.bau \

extras/ExternalPackage_accessoriesgallery.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,galle
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,share/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories/sg1010.sdg \
 	accessories/sg1010.sdv \
 	accessories/sg1010.thm \

extras/ExternalPackage_accessoriesgallerydrawspeople.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawsp
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,share/gallery/Draws/People,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
 	accessories/Draws/People/Baboo1.png \
 	accessories/Draws/People/Jac1.png \
 	accessories/Draws/People/Jac2.png \

extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelemen
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,share/gallery/Elements/Bullets2,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
 	accessories/Elements/Bullets2/amethyst.arrow.png \
 	accessories/Elements/Bullets2/amethyst.asterisk.png \
 	accessories/Elements/Bullets2/amethyst.circle-light.png \

extras/ExternalPackage_accessoriesgallerynonfree.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfre
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,share/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories-nonfree/sg600.sdg \
 	accessories-nonfree/sg600.sdv \
 	accessories-nonfree/sg600.thm \

extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,share/gallery/Photos/Buildings,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
 	accessories/Photos/Buildings/ArkSoft0408010009.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010023.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010026.jpg \

extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,share/gallery/Photos/Celebration,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
 	accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
 	accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
 ))

extras/ExternalPackage_accessoriesgalleryphotoscities.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,share/gallery/Photos/Cities,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
 	accessories/Photos/Cities/ArkSoft0507170040.jpg \
 	accessories/Photos/Cities/ArkSoft0507170041.jpg \
 	accessories/Photos/Cities/ArkSoft0508100003.jpg \

extras/ExternalPackage_accessoriesgalleryphotosfauna.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,share/gallery/Photos/Fauna,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
 	accessories/Photos/Fauna/ArkSoft0407030001.jpg \
 	accessories/Photos/Fauna/bee_on_citrus.jpg \
 	accessories/Photos/Fauna/dog01.jpg \

extras/ExternalPackage_accessoriesgalleryphotosflowers.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,share/gallery/Photos/Flowers,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
 	accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
 	accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
 	accessories/Photos/Flowers/ArkSoft0405010001.jpg \

extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,share/gallery/Photos/FoodsandDrinks,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_lasagna.jpg \

extras/ExternalPackage_accessoriesgalleryphotoshumans.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,share/gallery/Photos/Humans,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
 	accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
 	accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
 	accessories/Photos/Humans/1473308070_30ac88194b_o.jpg \

extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,share/gallery/Photos/Landscapes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
 	accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010050.jpg \

extras/ExternalPackage_accessoriesgalleryphotosobjects.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,share/gallery/Photos/Objects,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
 	accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_122931551.jpg \

extras/ExternalPackage_accessoriesgalleryphotosplants.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,share/gallery/Photos/Plants,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
 	accessories/Photos/Plants/ArkSoft0405020018.jpg \
 	accessories/Photos/Plants/ArkSoft0405020019.jpg \
 	accessories/Photos/Plants/ArkSoft0508100018.jpg \

extras/ExternalPackage_accessoriesgalleryphotosspace.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,share/gallery/Photos/Space,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
 	accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
 	accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
 	accessories/Photos/Space/Wikimedia_Space_2005-06-b-large_web.jpg \

extras/ExternalPackage_accessoriesgalleryphotosstatues.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,share/gallery/Photos/Statues,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
 	accessories/Photos/Statues/ArkSoft0507170027.jpg \
 	accessories/Photos/Statues/ArkSoft0507170032.jpg \
 	accessories/Photos/Statues/ArkSoft0507170033.jpg \

extras/ExternalPackage_accessoriesgalleryphotostravel.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,share/gallery/Photos/Travel,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
 	accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
 	accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
 	accessories/Photos/Travel/JS_PDPhO_tall_ship.jpg \

extras/ExternalPackage_accessoriestemplatescommon.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,share/template/common,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
 	templates/common/dummy_common_templates.txt \
 	templates/common/svn-commit.2.tmp \
 	templates/common/svn-commit.tmp \

extras/ExternalPackage_accessoriestemplatescommoneducate.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,share/template/common/educate,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
 	templates/common/educate/A4-chequered.otg \
 	templates/common/educate/A4-lin_2mm.otg \
 	templates/common/educate/A4-lin_3mm.otg \

extras/ExternalPackage_accessoriestemplatescommonfinance.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,share/template/common/finance,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
 	templates/common/finance/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonforms.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,share/template/common/forms,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
 	templates/common/forms/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonlabels.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,share/template/common/labels,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
 	templates/common/labels/24_port_patch_text.otg \
 	templates/common/labels/arrows-black-base.ott \
 	templates/common/labels/WL-OL1000.ott \

extras/ExternalPackage_accessoriestemplatescommonlayout.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,share/template/common/layout,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
 	templates/common/layout/31407-squares.otp \
 	templates/common/layout/abstract-015_1.jpg.otp \
 	templates/common/layout/abstract-015_2.jpg.otp \

extras/ExternalPackage_accessoriestemplatescommonmisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,share/template/common/misc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
 	templates/common/misc/White_Notebook_Paper_legal.ott \
 	templates/common/misc/Yellow_Pad_Legal.ott \
 ))

extras/ExternalPackage_accessoriestemplatescommonofficorr.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,share/template/common/officorr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
 	templates/common/officorr/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
 
 $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,share/template/common/offimisc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
 	templates/common/offimisc/dummy_common_templates.txt \