diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
| commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
| tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /filter | |
| parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff) | |
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
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 12182e207315..aef359ae50df 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,filter_docbook,$(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 faaeca903a17..fae4b030dd30 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,filter_xhtml,$(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 2576f75865a6..cedc3ba4ed84 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,filter_xslt,$(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)) |