From 058a3d1c46449dd5159bae30c83db4c2c5c335b4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 18 Aug 2013 18:45:45 +0200 Subject: 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 --- librelogo/Package_librelogo.mk | 4 ++-- librelogo/Package_librelogo_properties.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'librelogo') 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) \ )) -- cgit