From 51a32bbd323bf513310fb4d82d53e52b8b247f57 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 May 2013 12:46:15 +0200 Subject: 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 --- desktop/Package_scripts_install.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'desktop/Package_scripts_install.mk') 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 -- cgit v1.2.3