From 5397b49f4dba9d065984a8b0eb356333c565217a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 11 Sep 2013 00:42:52 +0200 Subject: 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 --- solenv/gbuild/platform/solaris.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'solenv/gbuild/platform/solaris.mk') diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 89a4cdccaa79..78e401c5803b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -17,7 +17,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_DEVINSTALLROOT := $(INSTDIR) +gb_INSTROOT := $(INSTDIR) +gb_DEVINSTALLROOT := $(gb_INSTROOT) include $(GBUILDDIR)/platform/com_GCC_defs.mk -- cgit