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

3 files changed, 12 insertions, 12 deletions

diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index e7ceefd3bd0a..456d545ee7c0 100644
--- a/desktop/Package_branding_custom.mk
+++ b/desktop/Package_branding_custom.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
 
 $(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\
     $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER)/shell,\
     $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index f164f720274e..046ba69dc5cd 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -13,20 +13,20 @@ $(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
 
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/swriter,swriter.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
 
 endif
 
 ifneq ($(OS),WNT)
 
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unopkg,unopkg.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 8c5db5bff42a..c0aadbdbd3e7 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_w
 
 $(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh))
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
 
 # vim:set noet sw=4 ts=4: