summaryrefslogtreecommitdiff
path: root/desktop/Package_scripts_install.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-25 20:42:34 +0200
committerTor Lillqvist <tml@collabora.com>2013-09-25 22:13:23 +0200
commit7a8db272e95e0d3255b515567ed5e00738cf6760 (patch)
treee46475b2aeabffd00e117c9ebe46eec60226fed2 /desktop/Package_scripts_install.mk
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 'desktop/Package_scripts_install.mk')
-rw-r--r--desktop/Package_scripts_install.mk18
1 files changed, 9 insertions, 9 deletions
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