summaryrefslogtreecommitdiff
path: root/scripting/Package_scriptproviderforpython.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-11 00:42:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-11 00:50:54 +0200
commit5397b49f4dba9d065984a8b0eb356333c565217a (patch)
tree8fa65285b27907c6620bfd48457018d92d63253c /scripting/Package_scriptproviderforpython.mk
parent06b632f0d367178b7266e50c6f140ef36984733f (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 'scripting/Package_scriptproviderforpython.mk')
-rw-r--r--scripting/Package_scriptproviderforpython.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index cd2e8b6d31fb..d92dec47d643 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
-$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py))