diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /extras | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'extras')
90 files changed, 90 insertions, 90 deletions
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 \ |