summaryrefslogtreecommitdiff
path: root/desktop/Package_scripts_install.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-10 12:46:15 +0200
committerPetr Mladek <pmladek@suse.cz>2013-05-29 14:42:54 +0200
commit51a32bbd323bf513310fb4d82d53e52b8b247f57 (patch)
tree5cad8ed06b0dd6dda4865881f2f81b9dfa3dcf76 /desktop/Package_scripts_install.mk
parentc8ce9f6d498ea0d9f09d96fac63a4a2a1c619edc (diff)
Abstract over PACKAGEDIRNAME as it is MacOS rather than program on Mac OS X
Otherwise, the FILELIST scp2 items would create a program directory even on Mac OS X, before gid_Brand_Unixlink_Program creates the program -> MacOS symlink. (gb_Pyuno_PROGRAMDIRNAME shoudl be renamed to something more general than Pyuno, and maybe more */Package_*.mk would benefit from using it.) Change-Id: Ib6fc8d1abaf3b1a47a0f026a62bf0abdb14fc521
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 c75f6db9b243..f54cc9e904be 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -17,15 +17,15 @@ $(eval $(call gb_Package_add_file,desktop_scripts_install,bin/ure-link,ure-link)
else
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/swriter,swriter.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,program/unopkg,unopkg.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/swriter,swriter.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/unopkg,unopkg.sh))
endif