From 7a8db272e95e0d3255b515567ed5e00738cf6760 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 25 Sep 2013 20:42:34 +0200 Subject: 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 --- solenv/gbuild/Library.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv/gbuild/Library.mk') diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 488f9884a4f8..5febb9784611 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -31,8 +31,8 @@ gb_Library_LAYER_DIRS := \ URELIB:$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ - OOO:$(INSTROOT)/$(gb_PROGRAMDIRNAME) \ - SHLXTHDL:$(INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ + OOO:$(INSTROOT)/$(LIBO_LIB_FOLDER) \ + SHLXTHDL:$(INSTROOT)/$(LIBO_LIB_FOLDER)/shlxthdl \ OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \ NONE:$(gb_Library_DLLDIR) \ -- cgit