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 /shell | |
| parent | 06b632f0d367178b7266e50c6f140ef36984733f (diff) | |
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 'shell')
| -rw-r--r-- | shell/Package_scripts.mk | 2 | ||||
| -rw-r--r-- | shell/Package_scripts_gnome.mk | 2 | ||||
| -rw-r--r-- | shell/Package_scripts_kde.mk | 2 | ||||
| -rw-r--r-- | shell/Package_senddoc.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk index d300337166bf..b0396826cbda 100644 --- a/shell/Package_scripts.mk +++ b/shell/Package_scripts.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,shell_scripts,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh)) diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk index 194dbef113b7..0fb01b7291b8 100644 --- a/shell/Package_scripts_gnome.mk +++ b/shell/Package_scripts_gnome.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,shell_scripts_gnome,$(gb_PROGRAMDIRNAME)/gnome-open-url,gnome-open-url.sh)) diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk index 5214df21575a..a3c8b8bb9fcb 100644 --- a/shell/Package_scripts_kde.mk +++ b/shell/Package_scripts_kde.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,shell_scripts_kde,$(gb_PROGRAMDIRNAME)/kde-open-url,kde-open-url.sh)) diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk index b2a7c28f95a9..cc6dcfcb8071 100644 --- a/shell/Package_senddoc.mk +++ b/shell/Package_senddoc.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,shell_senddoc,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh)) |