path: root/instsetoo_native
diff options
authorTor Lillqvist <>2013-09-25 20:42:34 +0200
committerTor Lillqvist <>2013-09-25 22:13:23 +0200
commit7a8db272e95e0d3255b515567ed5e00738cf6760 (patch)
treee46475b2aeabffd00e117c9ebe46eec60226fed2 /instsetoo_native
parentaa26a065867c36a412193db9854cf2ca97154dde (diff)
Start hacking --enable-canonical-installation-tree-structure back into shape
Had been totaly broken by the recent changes. (Which is fine, it is just an experimental hack anyway, I am not sure whether it will ever be used in anger. Just a pet peeve of mine, I dislike seeing libraries, configuration files, resources etc mixed together in one "program" folder, especially on OS X, where the convention is to have app-specific dylibs and frameworks in "Frameworks", and resource files in "Resources". But this is not any requirement as such; there are apps in the Mac App Store that blatantly "break" this convention.) Basically, replace uses of gb_PROGRAMDIRNAME and gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which for normal builds all expand to the same "program" anyway. Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
Diffstat (limited to 'instsetoo_native')
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/ b/instsetoo_native/
index 84807e83a16c..8985f87996c1 100644
--- a/instsetoo_native/
+++ b/instsetoo_native/
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTROOT)))
-$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
$(if $(ENABLE_OOENV),ooenv) \