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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/Package_docbook.mk | 2 | ||||
| -rw-r--r-- | filter/Package_xhtml.mk | 2 | ||||
| -rw-r--r-- | filter/Package_xslt.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk index 5c14376b0edd..12182e207315 100644 --- a/filter/Package_docbook.mk +++ b/filter/Package_docbook.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook)) -$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,filter_docbook,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\ DocBookTemplate.stw \ diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk index b2e3071fd16f..faaeca903a17 100644 --- a/filter/Package_xhtml.mk +++ b/filter/Package_xhtml.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt)) -$(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,filter_xhtml,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl)) $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl)) diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk index 760edb80b38c..2576f75865a6 100644 --- a/filter/Package_xslt.mk +++ b/filter/Package_xslt.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt)) -$(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,filter_xslt,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/copy.xsl,common/copy.xsl)) $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/math.xsl,common/math.xsl)) |