summaryrefslogtreecommitdiff
path: root/librelogo
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-18 18:45:45 +0200
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commit058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch)
tree28fae22c49b9cecdda52aa148dde2aba2b568ff9 /librelogo
parentbd2f7ef662122d5c1202911cb2f3b0ab1e124695 (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 'librelogo')
-rw-r--r--librelogo/Package_librelogo.mk4
-rw-r--r--librelogo/Package_librelogo_properties.mk2
2 files changed, 3 insertions, 3 deletions
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) \
))