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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/Package_opengl.mk | 2 | ||||
| -rw-r--r-- | sd/Package_web.mk | 4 | ||||
| -rw-r--r-- | sd/Package_xml.mk | 2 |
3 files changed, 4 insertions, 4 deletions
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 \ )) |