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 --- wizards/Package_depot.mk | 2 +- wizards/Package_euro.mk | 2 +- wizards/Package_form.mk | 2 +- wizards/Package_gimmicks.mk | 2 +- wizards/Package_import.mk | 2 +- wizards/Package_share.mk | 2 +- wizards/Package_standard.mk | 2 +- wizards/Package_template.mk | 2 +- wizards/Package_tools.mk | 2 +- wizards/Package_tutorials.mk | 2 +- wizards/Package_usr.mk | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'wizards') 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 \ )) -- cgit v1.2.3