diff options
186 files changed, 336 insertions, 271 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8c19c2787808..1015b6c88cd9 100644 --- a/RepositoryExternal.mk +++ b/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)) diff --git a/afms/ExternalPackage_fontunxafm.mk b/afms/ExternalPackage_fontunxafm.mk index d2600a1d9bb8..84e4c91ff69d 100644 --- a/afms/ExternalPackage_fontunxafm.mk +++ b/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 \ diff --git a/config_host.mk.in b/config_host.mk.in index 2b94485b319c..a5452eee690f 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/config_host/config_folders.h.in b/config_host/config_folders.h.in index f06abd6cc2fb..7f6fe2d225db 100644 --- a/config_host/config_folders.h.in +++ b/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 diff --git a/configure.ac b/configure.ac index f9394b7ef6ce..0e3892c10b1e 100644 --- a/configure.ac +++ b/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 =================================================================== diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index f981708c95e9..c8739fab3ae5 100644 --- a/desktop/Package_branding.mk +++ b/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))) \ )) diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index a901a761b04e..c181faaf23f5 100644 --- a/desktop/source/app/userinstall.cxx +++ b/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)) { diff --git a/extras/AllLangPackage_accessoriestemplates.mk b/extras/AllLangPackage_accessoriestemplates.mk index b544838ab231..8fa3e8908e35 100644 --- a/extras/AllLangPackage_accessoriestemplates.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplateseducate.mk b/extras/AllLangPackage_accessoriestemplateseducate.mk index ac6ed6031af7..f95b2ef0604e 100644 --- a/extras/AllLangPackage_accessoriestemplateseducate.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesfinance.mk b/extras/AllLangPackage_accessoriestemplatesfinance.mk index 7a41b74c903c..88a8e491af5c 100644 --- a/extras/AllLangPackage_accessoriestemplatesfinance.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesforms.mk b/extras/AllLangPackage_accessoriestemplatesforms.mk index 0ca6da98e5a4..1f450bf8ec6b 100644 --- a/extras/AllLangPackage_accessoriestemplatesforms.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplateslabels.mk b/extras/AllLangPackage_accessoriestemplateslabels.mk index 5f761c3c1a32..10cc9005a8af 100644 --- a/extras/AllLangPackage_accessoriestemplateslabels.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplateslayout.mk b/extras/AllLangPackage_accessoriestemplateslayout.mk index c83013897b48..366bbb0404ba 100644 --- a/extras/AllLangPackage_accessoriestemplateslayout.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesmisc.mk b/extras/AllLangPackage_accessoriestemplatesmisc.mk index 905b5b30ab3f..09f6436bd7b0 100644 --- a/extras/AllLangPackage_accessoriestemplatesmisc.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfree.mk b/extras/AllLangPackage_accessoriestemplatesnonfree.mk index 23641ebb0bcc..b72373778072 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfree.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk index 1a7134f97886..6d38379febc3 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk index 7b848d4a0a4e..30ecf49e23ff 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk index 673b0281e80a..d1e3dac568cc 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk index 1242cc8dbf94..16539cfd8600 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk index 2aaa5047a026..e36931ed5de6 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk index e2dd51d051d0..59f9375595cd 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk index 184d515f5333..df87a49c55fd 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk index 8a78d3c7a023..4f1f070c3bf7 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk index 4b16caadb92d..997dff05b0e1 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk index b7404ffd6419..818c7c735d5f 100644 --- a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesofficorr.mk b/extras/AllLangPackage_accessoriestemplatesofficorr.mk index 7dba3554df52..27f716764083 100644 --- a/extras/AllLangPackage_accessoriestemplatesofficorr.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk index ee36ecdeed68..8525a8ef303e 100644 --- a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatespersonal.mk b/extras/AllLangPackage_accessoriestemplatespersonal.mk index ce20cc824ac2..251ad52e5d2f 100644 --- a/extras/AllLangPackage_accessoriestemplatespersonal.mk +++ b/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 \ diff --git a/extras/AllLangPackage_accessoriestemplatespresent.mk b/extras/AllLangPackage_accessoriestemplatespresent.mk index c4e2648681ce..8cf486d2a893 100644 --- a/extras/AllLangPackage_accessoriestemplatespresent.mk +++ b/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 \ diff --git a/extras/AllLangPackage_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk index 3c249fe7b173..6453662647b3 100644 --- a/extras/AllLangPackage_autotextshare.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk index 3e3bc8830324..0180f707fb41 100644 --- a/extras/ExternalPackage_accessoriesgallery.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk index df6ffbebf119..6e61d5ff4465 100644 --- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk index 9fcdea15124f..419e043eaad0 100644 --- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk index ed8e692f5047..984fba371f7b 100644 --- a/extras/ExternalPackage_accessoriesgallerynonfree.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk index 1ce4f6f31d08..cb6b720d0f66 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk index 10e457b682f5..4890c8e5ce53 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk index f07ed203b0fc..6b90457508ca 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk index a70cc760ebc2..900a87b80364 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk index 50249fe0b350..dfd5febcd509 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk index 2513363ff167..b7e5f0221b1b 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk index a74f490ed2b7..6d5d26a58dc0 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk index a6a5cff526a2..de56f6d4be65 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk index a8f3990cb635..4f2326612e5f 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk index 76777afec5f4..e940d3075c65 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk index a62dbe77e4be..9d8ea9dcbde7 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk index 0125159d0a1b..7883f39bab66 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk index a4058579538b..b331d1468157 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk index 0430ec48820c..2e439ea8dc25 100644 --- a/extras/ExternalPackage_accessoriestemplatescommon.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk index da972e09283b..2f79d55790b5 100644 --- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk index 55b97dfca25e..4499c78cbf42 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/extras/ExternalPackage_accessoriestemplatescommonforms.mk index 4ce264567c1a..3e9063e0f9ce 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk index e28b2b1f0d4e..9140267c1eac 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk index 5c3232b0af9d..c9914f0ff42e 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk +++ b/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 \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk index f2cf1ca777bf..f32195db210a 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk index cc09376cc4e6..8fc6f2b03457 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk index cf3c5b5bafb3..8e4ee0feebe0 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk +++ b/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 \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk index f3cdde0cb7d4..3952f8653d2a 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,share/template/common/personal,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\ templates/common/personal/szivesoldal.otg \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk index d2c866954438..eb2aca268410 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm $(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,share/template/common/presnt,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ templates/common/presnt/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk index bf97717aac0a..0b480384ffb9 100644 --- a/extras/ExternalPackage_extra_fonts.mk +++ b/extras/ExternalPackage_extra_fonts.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTDIR))) $(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ decorative/BETSY2.ttf \ decorative/Berylibi.ttf \ decorative/Beryliub.ttf \ diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk index be1a4dc058bc..39d293a1aa66 100644 --- a/extras/Gallery_arrows.mk +++ b/extras/Gallery_arrows.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows)) -$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\ +$(eval $(call gb_Gallery_add_files,arrows,$(LIBO_SHARE_FOLDER)/gallery/arrows,\ extras/source/gallery/arrows/A01-Arrow-Gray-Left.svg \ extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.svg \ extras/source/gallery/arrows/A03-Arrow-Gray-Left.svg \ diff --git a/extras/Gallery_computers.mk b/extras/Gallery_computers.mk index e59300f78abe..eadbe8cfde4a 100644 --- a/extras/Gallery_computers.mk +++ b/extras/Gallery_computers.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,computers,extras/source/gallery/computers)) -$(eval $(call gb_Gallery_add_files,computers,share/gallery/computers,\ +$(eval $(call gb_Gallery_add_files,computers,$(LIBO_SHARE_FOLDER)/gallery/computers,\ extras/source/gallery/computers/Computer-Cloud.png \ extras/source/gallery/computers/Computer-Desktop.png \ extras/source/gallery/computers/Computer-Laptop-Black.png \ diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk index 4f732be9a86f..8c473fc45c33 100644 --- a/extras/Gallery_diagrams.mk +++ b/extras/Gallery_diagrams.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams)) -$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\ +$(eval $(call gb_Gallery_add_files,diagrams,$(LIBO_SHARE_FOLDER)/gallery/diagrams,\ extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.svg \ extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.svg \ extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.svg \ diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk index a069589e948a..2697a1cbfb0e 100644 --- a/extras/Gallery_education.mk +++ b/extras/Gallery_education.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education)) -$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\ +$(eval $(call gb_Gallery_add_files,education,$(LIBO_SHARE_FOLDER)/gallery/education,\ extras/source/gallery/education/Blackboard.png \ extras/source/gallery/education/Books.png \ extras/source/gallery/education/Chalk.png \ diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk index 16b4be29ccdc..bf4916ff600a 100644 --- a/extras/Gallery_environment.mk +++ b/extras/Gallery_environment.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,environment,extras/source/gallery/environment)) -$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\ +$(eval $(call gb_Gallery_add_files,environment,$(LIBO_SHARE_FOLDER)/gallery/environment,\ extras/source/gallery/environment/DrippingFaucet.png \ extras/source/gallery/environment/Earth.png \ extras/source/gallery/environment/EndangeredAnimals1.png \ diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk index c53d0d715b18..5fe085a26097 100644 --- a/extras/Gallery_finance.mk +++ b/extras/Gallery_finance.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance)) -$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\ +$(eval $(call gb_Gallery_add_files,finance,$(LIBO_SHARE_FOLDER)/gallery/finance,\ extras/source/gallery/finance/Agreement.png \ extras/source/gallery/finance/ATM01.png \ extras/source/gallery/finance/ATM02.png \ diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk index 41adf78c6832..f9a99040e1dc 100644 --- a/extras/Gallery_people.mk +++ b/extras/Gallery_people.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,people,extras/source/gallery/people)) -$(eval $(call gb_Gallery_add_files,people,share/gallery/people,\ +$(eval $(call gb_Gallery_add_files,people,$(LIBO_SHARE_FOLDER)/gallery/people,\ extras/source/gallery/people/Artist-Female1.png \ extras/source/gallery/people/Artist-Female2.png \ extras/source/gallery/people/Artist-Male1.png \ diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk index 1243b0cb2946..ace75ef620ce 100644 --- a/extras/Gallery_sound.mk +++ b/extras/Gallery_sound.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Gallery_Gallery,sounds,extras/source/gallery/sounds)) -$(eval $(call gb_Gallery_add_files,sounds,share/gallery/sounds,\ +$(eval $(call gb_Gallery_add_files,sounds,$(LIBO_SHARE_FOLDER)/gallery/sounds,\ extras/source/gallery/sounds/apert2.wav \ extras/source/gallery/sounds/apert.wav \ extras/source/gallery/sounds/applause.wav \ diff --git a/extras/Gallery_symbols.mk b/extras/Gallery_symbols.mk index 77e513d633c0..baaab635c07d 100644 --- a/extras/Gallery_symbols.mk +++ b/extras/Gallery_symbols.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,symbols,extras/source/gallery/symbols)) -$(eval $(call gb_Gallery_add_files,symbols,share/gallery/symbols,\ +$(eval $(call gb_Gallery_add_files,symbols,$(LIBO_SHARE_FOLDER)/gallery/symbols,\ extras/source/gallery/symbols/Book.svg \ extras/source/gallery/symbols/Box01.svg \ extras/source/gallery/symbols/Box02.svg \ diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk index 605782f4ab77..a043f8a2f8bf 100644 --- a/extras/Gallery_transportation.mk +++ b/extras/Gallery_transportation.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,transportation,extras/source/gallery/transportation)) -$(eval $(call gb_Gallery_add_files,transportation,share/gallery/transportation,\ +$(eval $(call gb_Gallery_add_files,transportation,$(LIBO_SHARE_FOLDER)/gallery/transportation,\ extras/source/gallery/transportation/Airplane-Blue.png \ extras/source/gallery/transportation/Bicycle-Blue.png \ extras/source/gallery/transportation/Boat.png \ diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk index fb3b4883a533..49ee3afe9336 100644 --- a/extras/Gallery_txtshapes.mk +++ b/extras/Gallery_txtshapes.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes)) -$(eval $(call gb_Gallery_add_files,txtshapes,share/gallery/txtshapes,\ +$(eval $(call gb_Gallery_add_files,txtshapes,$(LIBO_SHARE_FOLDER)/gallery/txtshapes,\ extras/source/gallery/txtshapes/Circle01-DarkBlue.svg \ extras/source/gallery/txtshapes/Circle02-LightBlue.svg \ extras/source/gallery/txtshapes/Circle03-Green.svg \ diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk index f24e75ea63e2..568762a567e8 100644 --- a/extras/Package_autocorr.mk +++ b/extras/Package_autocorr.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_work $(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_autocorr,share/autocorr,\ +$(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\ acor_af-ZA.dat \ acor_bg-BG.dat \ acor_cs-CZ.dat \ diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk index 7df6c3a0b5e5..0d3847a36e04 100644 --- a/extras/Package_autotextuser.mk +++ b/extras/Package_autotextuser.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/aut $(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_autotextuser,presets/autotext,\ +$(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\ mytexts.bau \ )) diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk index 1d617969f87f..f95e5be740e5 100644 --- a/extras/Package_cfgsrvbitmapunx.mk +++ b/extras/Package_cfgsrvbitmapunx.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/sou $(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\ +$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\ psetupl.xpm \ psetup.xpm \ )) diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk index 603a44479243..9da56d440930 100644 --- a/extras/Package_cfgsrvnolang.mk +++ b/extras/Package_cfgsrvnolang.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/mis $(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,share/config,\ +$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,$(LIBO_SHARE_FOLDER)/config,\ wizard/form/styles/beige.css \ wizard/form/styles/bgr.css \ wizard/form/styles/dark.css \ diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk index 45ec35147196..87920e862887 100644 --- a/extras/Package_cfgusr.mk +++ b/extras/Package_cfgusr.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_conf $(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_cfgusr,presets/config,\ +$(eval $(call gb_Package_add_files,extras_cfgusr,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ autotbl.fmt \ )) diff --git a/extras/Package_database.mk b/extras/Package_database.mk index 03800f57c6a6..af794e57f29c 100644 --- a/extras/Package_database.mk +++ b/extras/Package_database.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/databas $(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_database,presets/database,\ +$(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\ biblio.odb \ evolocal.odb \ )) diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk index a85c19332b37..2517b8ab2845 100644 --- a/extras/Package_databasebiblio.mk +++ b/extras/Package_databasebiblio.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/d $(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_databasebiblio,presets/database/biblio,\ +$(eval $(call gb_Package_add_files,extras_databasebiblio,$(LIBO_SHARE_PRESETS_FOLDER)/database/biblio,\ biblio.dbf \ biblio.dbt \ )) diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk index f75134913296..6a308043aea9 100644 --- a/extras/Package_fonts.mk +++ b/extras/Package_fonts.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras)) $(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTDIR))) -$(eval $(call gb_Package_add_file,extras_fonts,share/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf)) +$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk index c5d903f47a45..b1a6abdcdb58 100644 --- a/extras/Package_gallbullets.mk +++ b/extras/Package_gallbullets.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gall $(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\ +$(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\ blkpearl.gif \ bluarrow.gif \ bluball.gif \ diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk index f0531c5678a0..0f782fd69def 100644 --- a/extras/Package_gallhtmlexpo.mk +++ b/extras/Package_gallhtmlexpo.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gal $(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\ +$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\ bludown.gif \ blufirs_.gif \ blufirs.gif \ diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk index 4d46098d595f..03bffeb95a90 100644 --- a/extras/Package_gallmytheme.mk +++ b/extras/Package_gallmytheme.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall $(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallmytheme,presets/gallery,\ +$(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\ sg30.sdv \ sg30.thm \ )) diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk index cb1ae1b84229..d2076cbdf7fc 100644 --- a/extras/Package_gallroot.mk +++ b/extras/Package_gallroot.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery $(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\ +$(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\ apples.gif \ bigapple.gif \ flower.gif \ diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 9214ba204a43..bc027b0ae239 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/galle $(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ +$(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\ sg1.sdg \ sg1.sdv \ sg1.thm \ diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk index c8424319ac06..72e62f303d8c 100644 --- a/extras/Package_gallwwwback.mk +++ b/extras/Package_gallwwwback.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gall $(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallwwwback,share/gallery/www-back,\ +$(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\ aqua.jpg \ bathroom.jpg \ blocks.jpg \ diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk index 7285592b8eee..2041f15c269f 100644 --- a/extras/Package_gallwwwgraf.mk +++ b/extras/Package_gallwwwgraf.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gall $(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_gallwwwgraf,share/gallery/www-graf,\ +$(eval $(call gb_Package_add_files,extras_gallwwwgraf,$(LIBO_SHARE_FOLDER)/gallery/www-graf,\ bluat.gif \ bluback.gif \ bludisk.gif \ diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk index 00b818f96a07..f03cb4277c55 100644 --- a/extras/Package_glade.mk +++ b/extras/Package_glade.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir $(eval $(call gb_Package_set_outdir,extras_glade,$(INSTDIR))) -$(eval $(call gb_Package_add_file,extras_glade,share/glade/libreoffice-catalog.xml,libreoffice-catalog.xml)) +$(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk index 24ff8650c16b..ef64e5a0cd83 100644 --- a/extras/Package_labels.mk +++ b/extras/Package_labels.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels)) $(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR))) -$(eval $(call gb_Package_add_file,extras_labels,share/labels/labels.xml,labels.xml)) +$(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk index aebad8985a7d..0f93a23cb485 100644 --- a/extras/Package_newfiles.mk +++ b/extras/Package_newfiles.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellne $(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_newfiles,share/template/shellnew,\ +$(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\ soffice.odg \ soffice.odp \ soffice.ods \ diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk index 767fb785897b..a67681b5ad90 100644 --- a/extras/Package_palettes.mk +++ b/extras/Package_palettes.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette $(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_palettes,presets/config,\ +$(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ arrowhd.soe \ classic.sog \ cmyk.soc \ diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk index b0664fd42c80..a6c035445e0a 100644 --- a/extras/Package_tpllayoutimpr.mk +++ b/extras/Package_tpllayoutimpr.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/te $(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,share/template/common/layout,\ +$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\ AbstractGreen.otp \ AbstractRed.otp \ AbstractYellow.otp \ diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk index d24a0da577a1..f3b4bd36a689 100644 --- a/extras/Package_tplwizagenda.mk +++ b/extras/Package_tplwizagenda.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/tem $(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizagenda,share/template/common/wizard/agenda,\ +$(eval $(call gb_Package_add_files,extras_tplwizagenda,$(LIBO_SHARE_FOLDER)/template/common/wizard/agenda,\ 10grey.ott \ 1simple.ott \ 2elegant.ott \ diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk index 5213c87d096f..9ea51d3c1a66 100644 --- a/extras/Package_tplwizbitmap.mk +++ b/extras/Package_tplwizbitmap.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/tem $(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizbitmap,share/template/wizard/bitmap,\ +$(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\ cancel_down.bmp \ cancel_up.bmp \ down.bmp \ diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk index 9ab7839a0192..d3cd0ff83a65 100644 --- a/extras/Package_tplwizdesktop.mk +++ b/extras/Package_tplwizdesktop.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/te $(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizdesktop,share/template/common/internal,\ +$(eval $(call gb_Package_add_files,extras_tplwizdesktop,$(LIBO_SHARE_FOLDER)/template/common/internal,\ html.stw \ idxexample.odt \ )) diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk index 5076ee9bc606..a434d5f54126 100644 --- a/extras/Package_tplwizfax.mk +++ b/extras/Package_tplwizfax.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templa $(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizfax,share/template/common/wizard/fax,\ +$(eval $(call gb_Package_add_files,extras_tplwizfax,$(LIBO_SHARE_FOLDER)/template/common/wizard/fax,\ bus-classic_f.ott \ bus-classic-pri_f.ott \ bus-modern_f.ott \ diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk index 0705475cd2fe..5e71abd1c1a7 100644 --- a/extras/Package_tplwizletter.mk +++ b/extras/Package_tplwizletter.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/tem $(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizletter,share/template/common/wizard/letter,\ +$(eval $(call gb_Package_add_files,extras_tplwizletter,$(LIBO_SHARE_FOLDER)/template/common/wizard/letter,\ bus-elegant_l.ott \ bus-modern_l.ott \ bus-office_l.ott \ diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk index 3ec042ecc4c7..f35264323e06 100644 --- a/extras/Package_tplwizreport.mk +++ b/extras/Package_tplwizreport.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/tem $(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizreport,share/template/common/wizard/report,\ +$(eval $(call gb_Package_add_files,extras_tplwizreport,$(LIBO_SHARE_FOLDER)/template/common/wizard/report,\ cnt-011.ott \ cnt-012.ott \ cnt-01.ott \ diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk index 1c9a70e870fe..a637778d9518 100644 --- a/extras/Package_tplwizstyles.mk +++ b/extras/Package_tplwizstyles.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/tem $(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTDIR))) -$(eval $(call gb_Package_add_files,extras_tplwizstyles,share/template/common/wizard/styles,\ +$(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\ blackberry.ots \ black_white.ots \ default.ots \ diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk index 070ebe1e704e..5c14376b0edd 100644 --- a/filter/Package_docbook.mk +++ b/filter/Package_docbook.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook) $(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTDIR))) -$(eval $(call gb_Package_add_files,filter_docbook,share/xslt/docbook,\ +$(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\ DocBookTemplate.stw \ docbooktosoffheadings.xsl \ sofftodocbookheadings.xsl \ diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk index 39da72b9caea..b2e3071fd16f 100644 --- a/filter/Package_xhtml.mk +++ b/filter/Package_xhtml.mk @@ -20,9 +20,9 @@ $(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt)) $(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTDIR))) -$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl)) -$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl)) -$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl)) -$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl)) +$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl)) +$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl)) +$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl)) +$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl)) # vim: set noet sw=4 ts=4: diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk index 7a6eff9533a0..760edb80b38c 100644 --- a/filter/Package_xslt.mk +++ b/filter/Package_xslt.mk @@ -20,52 +20,52 @@ $(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt)) $(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTDIR))) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/copy.xsl,common/copy.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/math.xsl,common/math.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl)) -$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/copy.xsl,common/copy.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/math.xsl,common/math.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl)) # vim: set noet sw=4 ts=4: diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index c76b5ca32e1d..724e6ebe7114 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -20,9 +20,9 @@ <prop oor:name="Type"><value>writer_DocBook_File</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../share/xslt/docbook/docbooktosoffheadings.xsl,../share/xslt/docbook/sofftodocbookheadings.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../$(share_subdir_name)/xslt/docbook/docbooktosoffheadings.xsl,../$(share_subdir_name)/xslt/docbook/sofftodocbookheadings.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> - <prop oor:name="TemplateName"><value>../share/xslt/docbook/DocBookTemplate.stw</value></prop> + <prop oor:name="TemplateName"><value>../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw</value></prop> <prop oor:name="UIName"> <value>DocBook</value> </prop> diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu index 6e56d00dd704..f283b57a2933 100644 --- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu @@ -19,7 +19,7 @@ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../share/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../$(share_subdir_name)/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> <prop oor:name="Type"><value>calc_MS_Excel_2003_XML</value></prop> <prop oor:name="TemplateName"/> diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu index 61cdad1fc891..56efe87dd509 100644 --- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu @@ -19,7 +19,7 @@ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/wordml/wordml2ooo.xsl,../share/xslt/export/wordml/ooo2wordml.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/wordml/wordml2ooo.xsl,../$(share_subdir_name)/xslt/export/wordml/ooo2wordml.xsl</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> <prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop> <prop oor:name="TemplateName"/> diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu index c02f9b19f634..800e9e1dee61 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>Unified_Office_Format_presentation</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/import/uof/uof2odf_presentation.xsl,../share/xslt/export/uof/odf2uof_presentation.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_presentation.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_presentation.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu index fda148c24f8c..148131b5dc0c 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>Unified_Office_Format_spreadsheet</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/import/uof/uof2odf_spreadsheet.xsl,../share/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_spreadsheet.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu index 5f674c799563..0f7d6223712b 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu +++ b/filter/source/config/fragments/filters/UOF_text.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>Unified_Office_Format_text</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/uof/uof2odf_text.xsl,../share/xslt/export/uof/odf2uof_text.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_text.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_text.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu index 86dc69420026..a13b05dc9b8a 100644 --- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>XHTML_File</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu index dd6b55ccfd28..c63283a4e098 100644 --- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>XHTML_File</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu index 93e41a5bc5e5..f8431fe16520 100644 --- a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>XHTML_File</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu index cd17fc0d25f5..e50ec3077545 100644 --- a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu @@ -20,7 +20,7 @@ <prop oor:name="Type"><value>XHTML_File</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl,,true</value></prop> + <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl,,true</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="UIName"> diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk index 86973eeb36dc..85b980dc5421 100644 --- a/framework/Package_dtd.mk +++ b/framework/Package_dtd.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd)) $(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTDIR))) -$(eval $(call gb_Package_add_files,framework_dtd,share/dtd/officedocument/1_0,\ +$(eval $(call gb_Package_add_files,framework_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ accelerator.dtd \ event.dtd \ groupuinames.dtd \ diff --git a/libexttextcat/ExternalPackage_fingerprint.mk b/libexttextcat/ExternalPackage_fingerprint.mk index be9ce907e634..0105ece3104c 100644 --- a/libexttextcat/ExternalPackage_fingerprint.mk +++ b/libexttextcat/ExternalPackage_fingerprint.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,extte $(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_files,libexttextcat_fingerprint,share/fingerprint,\ +$(eval $(call gb_ExternalPackage_add_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\ langclass/fpdb.conf \ langclass/LM/ab.lm \ langclass/LM/ace.lm \ diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk index 605af552ad97..54790a178841 100644 --- a/liblangtag/ExternalPackage_liblangtag_data.mk +++ b/liblangtag/ExternalPackage_liblangtag_data.mk @@ -11,11 +11,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag)) $(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\ data/language-subtag-registry.xml \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/bcp47,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\ data/common/bcp47/calendar.xml \ data/common/bcp47/collation.xml \ data/common/bcp47/currency.xml \ @@ -29,7 +29,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblan data/common/bcp47/variant.xml \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/supplemental,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,\ data/common/supplemental/likelySubtags.xml \ )) diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk index 71181ce25d43..f80acae8cc33 100644 --- a/librelogo/Package_librelogo.mk +++ b/librelogo/Package_librelogo.mk @@ -11,12 +11,12 @@ $(eval $(call gb_Package_Package,librelogo,$(SRCDIR)/librelogo/source)) $(eval $(call gb_Package_set_outdir,librelogo,$(INSTDIR))) -$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo,\ +$(eval $(call gb_Package_add_files,librelogo,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\ LibreLogo/LibreLogo.py \ pythonpath/LibreLogo_en_US.properties \ )) -$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo/icons,\ +$(eval $(call gb_Package_add_files,librelogo,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo/icons,\ icons/lc_arrowshapes.circular-arrow.png \ icons/lc_arrowshapes.circular-leftarrow.png \ icons/lc_arrowshapes.down-arrow.png \ diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk index 3377470281e2..581a880e4252 100644 --- a/librelogo/Package_librelogo_properties.mk +++ b/librelogo/Package_librelogo_properties.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,librelogo_properties,$(call gb_CustomTarget_get $(eval $(call gb_Package_set_outdir,librelogo_properties,$(INSTDIR))) -$(eval $(call gb_Package_add_files,librelogo_properties,share/Scripts/python/LibreLogo,\ +$(eval $(call gb_Package_add_files,librelogo_properties,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\ $(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),LibreLogo_$(lang).properties) \ )) diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk index ad40182f7d18..71e42e89a987 100644 --- a/more_fonts/ExternalPackage_dejavu.mk +++ b/more_fonts/ExternalPackage_dejavu.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ttf/DejaVuSans-Bold.ttf \ ttf/DejaVuSans-BoldOblique.ttf \ ttf/DejaVuSans-ExtraLight.ttf \ diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk index 0cf551fa504b..2293e74599f3 100644 --- a/more_fonts/ExternalPackage_gentium.mk +++ b/more_fonts/ExternalPackage_gentium.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ GenBasB.ttf \ GenBasBI.ttf \ GenBasI.ttf \ diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk index 21015e25ef10..9fdd5945323d 100644 --- a/more_fonts/ExternalPackage_liberation.mk +++ b/more_fonts/ExternalPackage_liberation.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberatio $(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationMono-Bold.ttf \ LiberationMono-BoldItalic.ttf \ LiberationMono-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk index 74c6b569a434..60c4cc4a52a6 100644 --- a/more_fonts/ExternalPackage_liberation_narrow.mk +++ b/more_fonts/ExternalPackage_liberation_narrow.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_li $(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationSansNarrow-Bold.ttf \ LiberationSansNarrow-BoldItalic.ttf \ LiberationSansNarrow-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk index 7064ca934925..17a08a04594e 100644 --- a/more_fonts/ExternalPackage_libertineg.mk +++ b/more_fonts/ExternalPackage_libertineg.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertine $(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LinBiolinum_RB_G.ttf \ LinBiolinum_RI_G.ttf \ LinBiolinum_R_G.ttf \ diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk index 92d15e7fa84b..718e729a91b1 100644 --- a/more_fonts/ExternalPackage_opensans.mk +++ b/more_fonts/ExternalPackage_opensans.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ OpenSans-BoldItalic.ttf \ OpenSans-Bold.ttf \ OpenSans-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk index 9f978d62b812..6e6e7a4a6dc0 100644 --- a/more_fonts/ExternalPackage_ptserif.mk +++ b/more_fonts/ExternalPackage_ptserif.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ PT_Serif-Web-BoldItalic.ttf \ PT_Serif-Web-Bold.ttf \ PT_Serif-Web-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk index 42aa79eda3da..5ddb08dc82e6 100644 --- a/more_fonts/ExternalPackage_sourcecode.mk +++ b/more_fonts/ExternalPackage_sourcecode.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecod $(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceCodePro-Bold.ttf \ SourceCodePro-Regular.ttf \ )) diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk index da53e4a32733..7ba1945cad19 100644 --- a/more_fonts/ExternalPackage_sourcesans.mk +++ b/more_fonts/ExternalPackage_sourcesans.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesan $(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceSansPro-BoldItalic.ttf \ SourceSansPro-Bold.ttf \ SourceSansPro-Italic.ttf \ diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk index f5c03fc0ff1a..627afc06f2b6 100644 --- a/more_fonts/Package_conf.mk +++ b/more_fonts/Package_conf.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts)) $(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTDIR))) -$(eval $(call gb_Package_add_file,more_fonts_conf,share/fonts/truetype/fc_local.conf,fc_local.conf)) +$(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) # vim: set noet sw=4 ts=4: diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk index b4e8bd55b89b..cc1e063dcabb 100644 --- a/officecfg/Package_misc.mk +++ b/officecfg/Package_misc.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg)) $(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTDIR))) -$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) -$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) +$(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) +$(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) # vim: set noet sw=4 ts=4: diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 410a86995ece..77c23986ff78 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -452,7 +452,7 @@ </desc> <label>List of files containing transition effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml</value> </prop> <prop oor:name="EffectFiles" oor:type="oor:string-list" oor:nillable="false"> <!-- OldPath: --> @@ -467,7 +467,7 @@ </desc> <label>List of files containing object effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/effects.xml</value> </prop> <prop oor:name="PreviewNewEffects" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: --> diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk index a318f766717d..baa5068c73dc 100644 --- a/package/Package_dtd.mk +++ b/package/Package_dtd.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd)) $(eval $(call gb_Package_set_outdir,package_dtd,$(INSTDIR))) -$(eval $(call gb_Package_add_file,package_dtd,share/dtd/officedocument/1_0/Manifest.dtd,Manifest.dtd)) +$(eval $(call gb_Package_add_file,package_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0/Manifest.dtd,Manifest.dtd)) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Package_images_install.mk b/postprocess/Package_images_install.mk index af0f269d8d87..b7ad4e2aca6f 100644 --- a/postprocess/Package_images_install.mk +++ b/postprocess/Package_images_install.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarg $(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\ +$(eval $(call gb_Package_add_files,postprocess_images_install,$(LIBO_SHARE_FOLDER)/config,\ $(if $(filter default,$(WITH_THEMES)),images.zip) \ $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ )) diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk index c79d839321a7..d21d2a28d722 100644 --- a/postprocess/Package_registry_install.mk +++ b/postprocess/Package_registry_install.mk @@ -11,14 +11,14 @@ $(eval $(call gb_Package_Package,postprocess_registry_install,$(call gb_CustomTa $(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry,\ +$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ $(foreach lang,$(gb_Configuration_LANGS), \ Langpack-$(lang).xcd \ ) \ )) -$(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry/res,\ +$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry/res,\ $(foreach lang,$(gb_Configuration_LANGS), \ fcfg_langpack_$(lang).xcd \ registry_$(lang).xcd \ diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk index 622b6d5467fb..d06e0523be88 100644 --- a/psprint_config/Package_fontunxppds.mk +++ b/psprint_config/Package_fontunxppds.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_co $(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR))) -$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\ +$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\ SGENPRT.PS \ SGENT42.PS \ )) diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk index 1a6f381e7003..f71092c532ba 100644 --- a/psprint_config/Package_fontunxpsprint.mk +++ b/psprint_config/Package_fontunxpsprint.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint $(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR))) -$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\ +$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\ psprint.conf \ )) diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk index 94a9da8f5b67..d87bfba57c59 100644 --- a/python3/GeneratedPackage_python3.mk +++ b/python3/GeneratedPackage_python3.mk @@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) $(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) -$(eval $(call gb_GeneratedPackage_add_dir,python3,$(gb_Package_PROGRAMDIRNAME)/LibreOfficePython.framework,LibreOfficePython.framework)) +$(eval $(call gb_GeneratedPackage_add_dir,python3,$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework)) # vim: set noet sw=4 ts=4: diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index bc6d355f7907..a7b48d554cce 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -30,6 +30,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ + -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(filter YES,$(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)),../Frameworks/),g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk index 49df61503a11..6a68a3b6437f 100644 --- a/pyuno/Package_python_scripts_install.mk +++ b/pyuno/Package_python_scripts_install.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/so $(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(gb_PROGRAMDIRNAME),\ +$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ module/uno.py \ module/unohelper.py \ diff --git a/pyuno/zipcore/mac.sh b/pyuno/zipcore/mac.sh index 7543e6d3f31f..9f04b99a3157 100644 --- a/pyuno/zipcore/mac.sh +++ b/pyuno/zipcore/mac.sh @@ -1,4 +1,4 @@ -PYTHONHOME=$sd_prog/LibreOfficePython.framework +PYTHONHOME=$sd_prog/%%PYTHON_FRAMEWORK_RELATIVE_PATH%%LibreOfficePython.framework export PYTHONHOME pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%% diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_reportbuilder-templates.mk index dec8473e11b6..85929389cddd 100644 --- a/reportbuilder/Package_reportbuilder-templates.mk +++ b/reportbuilder/Package_reportbuilder-templates.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder $(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,share/template, \ +$(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,$(LIBO_SHARE_FOLDER)/template, \ common/wizard/report/default.otr \ )) diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index 8d6c5ee26d23..219a0c9e27f7 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) +$(eval $(call gb_InstallModule_define_if_set,scp2/graphicfilter,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/file_graphicfilter \ )) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index c84ac382c831..21bc3ef20f9b 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -27,6 +27,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ endif else + +$(eval $(call gb_InstallModule_define_if_set,scp2/python,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) + $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ -DPYMAJMIN=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk index 6e5534f8db4e..1ed82fa64ce6 100644 --- a/scp2/InstallModule_ure.mk +++ b/scp2/InstallModule_ure.mk @@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure)) $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ SYSTEM_LIBXML \ )) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index fabb82ddb4d8..4d588a4d0e69 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -492,7 +492,7 @@ End #define URE_EXECUTABLE(id,name) \ File id \ BIN_FILE_BODY; \ - Dir = gid_Dir_Ure_Bin; \ + Dir = GID_DIR_URE_BIN; \ Name = name; \ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ End diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 8ea797982a77..665b8bfedf76 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -135,7 +135,9 @@ Directory gid_Brand_Dir_Program_Shell End Directory gid_Brand_Dir_Readme -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX ParentID = gid_Dir_Bundle_Contents; #else ParentID = gid_Dir_Brand_Root; @@ -485,7 +487,9 @@ End File gid_Brand_File_Html_Thirdpartylicensereadme Name = "LICENSE.html"; -#ifdef MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; @@ -494,7 +498,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme TXT_FILE_BODY; End -#if defined UNX && !defined ENABLE_MACOSX_SANDBOX +#if defined UNX && !defined ENABLE_MACOSX_SANDBOX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE File gid_Brand_File_Gdb_Trace TXT_FILE_BODY; @@ -591,7 +595,7 @@ File gid_Brand_File_Script_Unopkg End #endif -#if defined MACOSX && !defined ENABLE_MACOSX_SANDBOX +#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Unixlink gid_Brand_Unixlink_Unopkg BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -1400,7 +1404,9 @@ End File gid_License_Txt TXT_FILE_BODY; -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; @@ -1416,7 +1422,9 @@ End File gid_License_Odt BIN_FILE_BODY; -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; @@ -1427,7 +1435,9 @@ End File gid_Credits_Odt BIN_FILE_BODY; -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; @@ -1438,7 +1448,9 @@ End File gid_Apache_Notice BIN_FILE_BODY; -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 3a099a25293e..36d652290598 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -112,7 +112,9 @@ End #endif Directory gid_Dir_User -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX ParentID = gid_Dir_Bundle_Contents; #else ParentID = gid_Dir_Brand_Root; @@ -357,7 +359,9 @@ Directory gid_Dir_Share_Fingerprint End Directory gid_Dir_Help -#if defined MACOSX +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX ParentID = gid_Dir_Bundle_Contents; #else ParentID = gid_Dir_Brand_Root; diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 99e65909239f..2df138ab3e7d 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -19,7 +19,6 @@ #include "macros.inc" #ifdef UNX -#ifndef ENABLE_MACOSX_MACLIKE_APP_STRUCTURE #ifndef SYSTEM_ICU Shortcut gid_Shortcut_Lib_Icudata @@ -59,8 +58,6 @@ End #endif -#endif - #ifdef MACOSX #ifdef SOLAR_JAVA diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 939bd3caf395..08b60f66f38b 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -18,10 +18,10 @@ #include "macros.inc" -#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE - #include "AutoInstall/ure" +#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Directory gid_Dir_Ure_Bin #if defined MACOSX ParentID = gid_Dir_UreLink; diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index ee4dac62b9fa..e66eb1aa7602 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -38,8 +38,10 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome Section = "Bootstrap"; Order = 1; Key = "PYUNO_LOADER_PYTHONHOME"; - #ifdef MACOSX + #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; + #elif defined MACOSX + Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); #else Value = CONCAT2($ORIGIN/python-core-,PYVERSION); #endif diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk index 88315df303b6..44b664126cbb 100644 --- a/scripting/Package_ScriptsBeanShell.mk +++ b/scripting/Package_ScriptsBeanShell.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/ $(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,share/Scripts,\ +$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\ beanshell/Capitalise/capitalise.bsh \ beanshell/Capitalise/parcel-descriptor.xml \ beanshell/HelloWorld/helloworld.bsh \ diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk index 3103c511bfa1..8780778d1407 100644 --- a/scripting/Package_ScriptsJavaScript.mk +++ b/scripting/Package_ScriptsJavaScript.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting $(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,share/Scripts,\ +$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\ javascript/ExportSheetsToHTML/exportsheetstohtml.js \ javascript/ExportSheetsToHTML/parcel-descriptor.xml \ javascript/HelloWorld/helloworld.js \ diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk index d88d810b0c86..aa9985b035eb 100644 --- a/scripting/Package_ScriptsPython.mk +++ b/scripting/Package_ScriptsPython.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa $(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,share/Scripts,\ +$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\ python/Capitalise.py \ python/HelloWorld.py \ python/pythonSamples/TableSample.py \ diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk index a840e2096dbc..7c846c0b37cd 100644 --- a/scripting/Package_java.mk +++ b/scripting/Package_java.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/jav $(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,scripting_java,share/Scripts/java,\ +$(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\ HelloWorld/HelloWorld.java \ HelloWorld/parcel-descriptor.xml \ Highlight/HighlightText.java \ diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk index 4e7ba203c00d..eaeee8be91f1 100644 --- a/scripting/Package_java_jars.mk +++ b/scripting/Package_java_jars.mk @@ -11,8 +11,8 @@ $(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin)) $(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR))) -$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar)) -$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/Highlight/Highlight.jar,Highlight.jar)) -$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar)) +$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar)) +$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/Highlight/Highlight.jar,Highlight.jar)) +$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar)) # vim: set noet sw=4 ts=4: diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk index 5320d5a8e285..d630058eee5a 100644 --- a/scripting/Package_scriptbindinglib.mk +++ b/scripting/Package_scriptbindinglib.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/ $(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTDIR))) -$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,share/basic/ScriptBindingLibrary,\ +$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\ Highlight.xdl \ dialog.xlb \ script.xlb \ diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk index afe0e1232172..cd2e8b6d31fb 100644 --- a/scripting/Package_scriptproviderforpython.mk +++ b/scripting/Package_scriptproviderforpython.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/sou $(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR))) -$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) -$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/pythonscript.py,pythonscript.py)) +$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) +$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py)) # vim: set noet sw=4 ts=4: diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk index 15a33da7dbfc..e51ac95165ce 100644 --- a/sd/Package_opengl.mk +++ b/sd/Package_opengl.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml)) $(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTDIR))) -$(eval $(call gb_Package_add_files,sd_opengl,share/config/soffice.cfg/simpress,\ +$(eval $(call gb_Package_add_files,sd_opengl,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ transitions-ogl.xml \ )) diff --git a/sd/Package_web.mk b/sd/Package_web.mk index d4507ab165fc..64c78388529f 100644 --- a/sd/Package_web.mk +++ b/sd/Package_web.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res)) $(eval $(call gb_Package_set_outdir,sd_web,$(INSTDIR))) -$(eval $(call gb_Package_add_files,sd_web,share/config/webcast,\ +$(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\ webview/common.inc \ webview/common.pl \ webview/edit.asp \ @@ -29,7 +29,7 @@ $(eval $(call gb_Package_add_files,sd_web,share/config/webcast,\ webview/webcast.pl \ )) -$(eval $(call gb_Package_add_files,sd_web,share/config/wizard/web/buttons,\ +$(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/wizard/web/buttons,\ buttons/glas-blue.zip \ buttons/glas-green.zip \ buttons/glas-red.zip \ diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk index 94e96075d146..3178e0d49d10 100644 --- a/sd/Package_xml.mk +++ b/sd/Package_xml.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml)) $(eval $(call gb_Package_set_outdir,sd_xml,$(INSTDIR))) -$(eval $(call gb_Package_add_files,sd_xml,share/config/soffice.cfg/simpress,\ +$(eval $(call gb_Package_add_files,sd_xml,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ effects.xml \ transitions.xml \ )) diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index d5ab3294aeb3..4409769533aa 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <vcl/canvastools.hxx> #include <vcl/status.hxx> #include <vcl/msgbox.hxx> @@ -166,7 +168,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid osl_getProcessLocale (&pLoc); LanguageTag aLanguageTag( *pLoc); - OUString uri = OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; + OUString uri = OUString::createFromAscii( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER ) + aBaseName+aSvg; rtl::Bootstrap::expandMacros( uri ); INetURLObject aObj( uri ); SvgData aSvgData(aObj.PathToFileName()); diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index b31924447193..111f5cf0198c 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -38,6 +38,8 @@ # That latter case is useful for libraries from external modules, where the # external build process locates them in some sub-directory. +my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; + sub action($$$) { # The @__VIA_LIBRARY_PATH__ thing has no magic meaning anywhere @@ -45,8 +47,6 @@ sub action($$$) # comment telling that this library is supposed to have been found # by the dynamic linker already in DYLD_LIBRARY_PATH. - my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; - my %action = ('app/UREBIN/URELIB' => ($OLD ? '@executable_path/../lib' : '@executable_path/../Frameworks'), 'app/OOO/URELIB' => ($OLD ? '@executable_path/../ure-link/lib' : '@executable_path/../Frameworks'), diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 113f59bebca4..b19d0cba63a9 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -41,7 +41,7 @@ gb_Gallery_EXTRA_DEPENCENCIES := \ $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(foreach api,$(gb_Gallery__UNO_TYPES),$(call gb_UnoApi_get_target,$(api))) -gb_Gallery_INSTDIR := share/gallery +gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery # BRAND_BASE_DIR is for resource files define gb_Gallery__make_env_args diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index cef49ce9e7f1..52f82f115269 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -55,8 +55,9 @@ endef # Package class +gb_Package_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER) + # defined by platform -# gb_Package_PROGRAMDIRNAME # gb_Package_SDKDIRNAME $(dir $(call gb_Package_get_target,%)).dir : diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index e6f4412ea2f8..539a961f4a16 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -41,7 +41,7 @@ $(call gb_PythonTest_get_target,%) : $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(DEFS) \ - URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/program/fundamental) \ + URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/$(LIBO_ETC_FOLDER)/fundamental) \ PYTHONPATH="$(PYPATH)" \ UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ @@ -56,7 +56,7 @@ $(call gb_PythonTest_get_target,%) : # always use udkapi and URE services define gb_PythonTest_PythonTest -$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/program +$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_PYUNO_FOLDER) $(call gb_PythonTest_get_target,$(1)) : MODULES := $(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1)))) diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index 498a4de71d63..36385d2856af 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -46,7 +46,7 @@ endef # gb_Pyuno_add_file component destination source define gb_Pyuno_add_file -$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_PROGRAMDIRNAME)/$(2),$(3)) +$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(LIBO_LIB_PYUNO_FOLDER)/$(2),$(3)) endef diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index d76d5dd9ec64..2033e06034fd 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -167,7 +167,7 @@ endef # of .ui files. This filelist only exists if the UIConfig contains any # .ui files. -gb_UIConfig_INSTDIR := share/config/soffice.cfg +gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg # en-US is the default, so there is no translation for it gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9681dd25f8aa..b320cf4cc403 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -181,6 +181,8 @@ $(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo +gb_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER) + # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 3ad06e558e9e..33217b4c2546 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -19,8 +19,6 @@ gb_CPUDEFS := -DARM32 -gb_PROGRAMDIRNAME := program - ifeq ($(CC),) $(error You must set CC in the environment. See README.cross for example.) endif @@ -262,7 +260,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := program gb_Package_SDKDIRNAME := sdk # UIMenubarTarget class diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 8999838c8a69..3d3791501ed5 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -19,8 +19,6 @@ gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt -gb_PROGRAMDIRNAME := program - # Convert path to file URL. define gb_Helper_make_url file:///$(strip $(1)) @@ -564,7 +562,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := program gb_Package_SDKDIRNAME := sdk # UIMenubarTarget class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index cb27bf20e298..893c203b11a4 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -19,8 +19,6 @@ gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents -gb_PROGRAMDIRNAME := MacOS - gb_SDKDIR := $(MACOSX_SDK_PATH) include $(GBUILDDIR)/platform/com_GCC_defs.mk @@ -313,7 +311,11 @@ endef # PythonTest class -gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/ure-link/lib:$(gb_DEVINSTALLROOT)/program:$(OUTDIR)/lib +gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/$(LIBO_URE_LIB_FOLDER) +ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER)) +gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER) +endif +gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib # Module class @@ -367,7 +369,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := MacOS gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK # UIMenubarTarget class @@ -387,7 +388,7 @@ endef # Python gb_Python_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib -gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython +gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython # this is passed to gdb as executable when running tests gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE) diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 9375a0574ff3..d0bbc71a3164 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -17,8 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_PROGRAMDIRNAME := program - gb_RC := $(WINDRES) gb_COMPILERDEFS += \ @@ -375,7 +373,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := program gb_Package_SDKDIRNAME := sdk # UIMenubarTarget class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index f9d236b1c466..3c633c1718d9 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -19,8 +19,6 @@ gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt -gb_PROGRAMDIRNAME := program - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX @@ -397,7 +395,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := program gb_Package_SDKDIRNAME := sdk # UIMenubarTarget class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9eb79fd9e2c0..0a2c53d99f9b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -19,8 +19,6 @@ gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt -gb_PROGRAMDIRNAME := program - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX @@ -394,7 +392,6 @@ gb_UnoApiHeadersTarget_select_variant = $(2) endif # Package class -gb_Package_PROGRAMDIRNAME := program gb_Package_SDKDIRNAME := sdk # UIMenubarTarget class diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 68482fc680f3..729002d1fd95 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <comphelper/string.hxx> #include <rsc/rscsfx.hxx> #include <vcl/msgbox.hxx> @@ -493,7 +495,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) sTemplate += ".odt"; SvtPathOptions aOpt; - aOpt.SetTemplatePath(String("share/template/common")); + aOpt.SetTemplatePath(String(LIBO_SHARE_FOLDER "/template/common")); // 6.0 (extension .sxw) bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); diff --git a/wizards/Package_depot.mk b/wizards/Package_depot.mk index 6a9d724cd487..7ee4728a6884 100644 --- a/wizards/Package_depot.mk +++ b/wizards/Package_depot.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/ $(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvdepot,share/basic/Depot,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvdepot,$(LIBO_SHARE_FOLDER)/basic/Depot,\ CommonLang.xba \ Currency.xba \ Depot.xba \ diff --git a/wizards/Package_euro.mk b/wizards/Package_euro.mk index af9377fb0982..892c482c4108 100644 --- a/wizards/Package_euro.mk +++ b/wizards/Package_euro.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/e $(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrveuro,share/basic/Euro,\ +$(eval $(call gb_Package_add_files,wizards_basicsrveuro,$(LIBO_SHARE_FOLDER)/basic/Euro,\ AutoPilotRun.xba \ Common.xba \ ConvertRun.xba \ diff --git a/wizards/Package_form.mk b/wizards/Package_form.mk index 4f6917aa2469..e7bbea30bee6 100644 --- a/wizards/Package_form.mk +++ b/wizards/Package_form.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/f $(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvform,share/basic/FormWizard,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvform,$(LIBO_SHARE_FOLDER)/basic/FormWizard,\ DBMeta.xba \ develop.xba \ dialog.xlb \ diff --git a/wizards/Package_gimmicks.mk b/wizards/Package_gimmicks.mk index dae0cabcc80c..130d1b754b9d 100644 --- a/wizards/Package_gimmicks.mk +++ b/wizards/Package_gimmicks.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/sour $(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,share/basic/Gimmicks,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,$(LIBO_SHARE_FOLDER)/basic/Gimmicks,\ AutoText.xba \ ChangeAllChars.xba \ dialog.xlb \ diff --git a/wizards/Package_import.mk b/wizards/Package_import.mk index 21b2de62b892..5bffcb587b83 100644 --- a/wizards/Package_import.mk +++ b/wizards/Package_import.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source $(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvimport,share/basic/ImportWizard,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvimport,$(LIBO_SHARE_FOLDER)/basic/ImportWizard,\ API.xba \ dialog.xlb \ DialogModul.xba \ diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk index 0985c6eb07f6..e78df3d90605 100644 --- a/wizards/Package_share.mk +++ b/wizards/Package_share.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/con $(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicshare,share/basic,\ +$(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\ dialog.xlc \ script.xlc \ )) diff --git a/wizards/Package_standard.mk b/wizards/Package_standard.mk index 07356972cbcf..91e6b7fe6aa0 100644 --- a/wizards/Package_standard.mk +++ b/wizards/Package_standard.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/sour $(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvstandard,presets/basic/Standard,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvstandard,$(LIBO_SHARE_PRESETS_FOLDER)/basic/Standard,\ dialog.xlb \ Module1.xba \ script.xlb \ diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk index 9b129169dd2b..cfbb150b96bd 100644 --- a/wizards/Package_template.mk +++ b/wizards/Package_template.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/sour $(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,share/basic/Template,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\ Autotext.xba \ Correspondence.xba \ dialog.xlb \ diff --git a/wizards/Package_tools.mk b/wizards/Package_tools.mk index 24696ae52129..243a7584097f 100644 --- a/wizards/Package_tools.mk +++ b/wizards/Package_tools.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/ $(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvtools,share/basic/Tools,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvtools,$(LIBO_SHARE_FOLDER)/basic/Tools,\ Debug.xba \ dialog.xlb \ DlgOverwriteAll.xdl \ diff --git a/wizards/Package_tutorials.mk b/wizards/Package_tutorials.mk index a3e8b084476c..0fbb6305d4e4 100644 --- a/wizards/Package_tutorials.mk +++ b/wizards/Package_tutorials.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/sou $(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,share/basic/Tutorials,\ +$(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,$(LIBO_SHARE_FOLDER)/basic/Tutorials,\ dialog.xlb \ Functions.xba \ RoadMap.xba \ diff --git a/wizards/Package_usr.mk b/wizards/Package_usr.mk index 0a7667345b13..4e6261d61a59 100644 --- a/wizards/Package_usr.mk +++ b/wizards/Package_usr.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/confi $(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTDIR))) -$(eval $(call gb_Package_add_files,wizards_basicusr,presets/basic,\ +$(eval $(call gb_Package_add_files,wizards_basicusr,$(LIBO_SHARE_PRESETS_FOLDER)/basic,\ dialog.xlc \ script.xlc \ )) diff --git a/xmlhelp/Package_helpxsl.mk b/xmlhelp/Package_helpxsl.mk index ca862769e5e2..79bd3abd3ad7 100644 --- a/xmlhelp/Package_helpxsl.mk +++ b/xmlhelp/Package_helpxsl.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util)) $(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTDIR))) -$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,help,\ +$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,$(LIBO_SHARE_HELP_FOLDER),\ idxcaption.xsl \ idxcontent.xsl \ main_transform.xsl \ diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 40206dba33f7..3c2235e88acf 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/************************************************************************** - TODO - ************************************************************************** - - *************************************************************************/ +#include <config_folders.h> #include <stdio.h> #include <osl/file.hxx> @@ -235,7 +231,7 @@ void ContentProvider::init() OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); if( instPath.isEmpty() ) // try to determine path from default - instPath = OUString( "$(instpath)/help" ); + instPath = OUString( "$(instpath)/" LIBO_SHARE_HELP_FOLDER ); // replace anything like $(instpath); subst( instPath ); diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk index 7375869b8382..c235edba0f6a 100644 --- a/xmloff/Package_dtd.mk +++ b/xmloff/Package_dtd.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd)) $(eval $(call gb_Package_set_outdir,xmloff_dtd,$(INSTDIR))) -$(eval $(call gb_Package_add_files,xmloff_dtd,share/dtd/officedocument/1_0,\ +$(eval $(call gb_Package_add_files,xmloff_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ chart.mod \ datastyl.mod \ defs.mod \ diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk index b4cfd31291fc..d452aa9297ff 100644 --- a/xmlscript/Package_dtd.mk +++ b/xmlscript/Package_dtd.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript)) $(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(INSTDIR))) -$(eval $(call gb_Package_add_files,xmlscript_dtd,share/dtd/officedocument/1_0,\ +$(eval $(call gb_Package_add_files,xmlscript_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ dtd/dialog.dtd \ dtd/libraries.dtd \ dtd/library.dtd \ |