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 /external | |
| 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 'external')
| -rw-r--r-- | external/Package_mingw_dlls.mk | 2 | ||||
| -rw-r--r-- | external/Package_msvc_dlls.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk index 52eeed8a8178..3b0f2b9a0a35 100644 --- a/external/Package_mingw_dlls.mk +++ b/external/Package_mingw_dlls.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) -$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,mingw_dlls,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,mingw_dlls,bin,\ $(sort $(MINGW_DLLS)) \ diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk index cbf09aa15ecb..47896f045b54 100644 --- a/external/Package_msvc_dlls.mk +++ b/external/Package_msvc_dlls.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH))) -$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,msvc_dlls,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\ $(MSVC_DLLS) \ |