path: root/desktop/
diff options
authorStephan Bergmann <>2013-09-11 00:42:52 +0200
committerStephan Bergmann <>2013-09-11 00:50:54 +0200
commit5397b49f4dba9d065984a8b0eb356333c565217a (patch)
tree8fa65285b27907c6620bfd48457018d92d63253c /desktop/
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)/ 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/*/ vs. instdir/*/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
Diffstat (limited to 'desktop/')
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/ b/desktop/
index c64c2bdba0e9..2d36a59d190e 100644
--- a/desktop/
+++ b/desktop/
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
-$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(gb_INSTROOT)))
ifneq ($(OS),WNT)