diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:42:52 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:50:54 +0200 |
commit | 5397b49f4dba9d065984a8b0eb356333c565217a (patch) | |
tree | 8fa65285b27907c6620bfd48457018d92d63253c /wizards | |
parent | Fix notes jumps. (diff) | |
download | core-5397b49f4dba9d065984a8b0eb356333c565217a.tar.gz core-5397b49f4dba9d065984a8b0eb356333c565217a.zip |
Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
Diffstat (limited to 'wizards')
-rw-r--r-- | wizards/Package_depot.mk | 2 | ||||
-rw-r--r-- | wizards/Package_euro.mk | 2 | ||||
-rw-r--r-- | wizards/Package_form.mk | 2 | ||||
-rw-r--r-- | wizards/Package_gimmicks.mk | 2 | ||||
-rw-r--r-- | wizards/Package_import.mk | 2 | ||||
-rw-r--r-- | wizards/Package_share.mk | 2 | ||||
-rw-r--r-- | wizards/Package_standard.mk | 2 | ||||
-rw-r--r-- | wizards/Package_template.mk | 2 | ||||
-rw-r--r-- | wizards/Package_tools.mk | 2 | ||||
-rw-r--r-- | wizards/Package_tutorials.mk | 2 | ||||
-rw-r--r-- | wizards/Package_usr.mk | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/wizards/Package_depot.mk b/wizards/Package_depot.mk index 7ee4728a6884..6080e6311438 100644 --- a/wizards/Package_depot.mk +++ b/wizards/Package_depot.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/depot)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvdepot,$(LIBO_SHARE_FOLDER)/basic/Depot,\ CommonLang.xba \ diff --git a/wizards/Package_euro.mk b/wizards/Package_euro.mk index 892c482c4108..0f80d8eea422 100644 --- a/wizards/Package_euro.mk +++ b/wizards/Package_euro.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/euro)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrveuro,$(LIBO_SHARE_FOLDER)/basic/Euro,\ AutoPilotRun.xba \ diff --git a/wizards/Package_form.mk b/wizards/Package_form.mk index e7bbea30bee6..54c47a0c4a56 100644 --- a/wizards/Package_form.mk +++ b/wizards/Package_form.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/formwizard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvform,$(LIBO_SHARE_FOLDER)/basic/FormWizard,\ DBMeta.xba \ diff --git a/wizards/Package_gimmicks.mk b/wizards/Package_gimmicks.mk index 130d1b754b9d..1844845d5259 100644 --- a/wizards/Package_gimmicks.mk +++ b/wizards/Package_gimmicks.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,$(LIBO_SHARE_FOLDER)/basic/Gimmicks,\ AutoText.xba \ diff --git a/wizards/Package_import.mk b/wizards/Package_import.mk index 5bffcb587b83..f2d187ec8eda 100644 --- a/wizards/Package_import.mk +++ b/wizards/Package_import.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source/importwizard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvimport,$(LIBO_SHARE_FOLDER)/basic/ImportWizard,\ API.xba \ diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk index e78df3d90605..ed9a863224de 100644 --- a/wizards/Package_share.mk +++ b/wizards/Package_share.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare)) -$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\ dialog.xlc \ diff --git a/wizards/Package_standard.mk b/wizards/Package_standard.mk index 91e6b7fe6aa0..294ca32ec3a6 100644 --- a/wizards/Package_standard.mk +++ b/wizards/Package_standard.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/source/standard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvstandard,$(LIBO_SHARE_PRESETS_FOLDER)/basic/Standard,\ dialog.xlb \ diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk index cfbb150b96bd..1d9225e84225 100644 --- a/wizards/Package_template.mk +++ b/wizards/Package_template.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\ Autotext.xba \ diff --git a/wizards/Package_tools.mk b/wizards/Package_tools.mk index 243a7584097f..309468b991a3 100644 --- a/wizards/Package_tools.mk +++ b/wizards/Package_tools.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/tools)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvtools,$(LIBO_SHARE_FOLDER)/basic/Tools,\ Debug.xba \ diff --git a/wizards/Package_tutorials.mk b/wizards/Package_tutorials.mk index 0fbb6305d4e4..fb553c4f7a5b 100644 --- a/wizards/Package_tutorials.mk +++ b/wizards/Package_tutorials.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,$(LIBO_SHARE_FOLDER)/basic/Tutorials,\ dialog.xlb \ diff --git a/wizards/Package_usr.mk b/wizards/Package_usr.mk index 4e6261d61a59..08c3ee69b890 100644 --- a/wizards/Package_usr.mk +++ b/wizards/Package_usr.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config)) -$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicusr,$(LIBO_SHARE_PRESETS_FOLDER)/basic,\ dialog.xlc \ |