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

4 files changed, 14 insertions, 14 deletions

diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 47186bc5b4c9..25909e85c7fe 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
 
 $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,desktop_branding,program,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME),\
     $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
 		$(if $(filter intro.png,$(image)),\
 			$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_add_files,desktop_branding,program,\
 	) \
 ))
 
-$(eval $(call gb_Package_add_files,desktop_branding,program/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME)/shell,\
     $(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
 ))
 
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index c240ab7656c2..449a4299154f 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,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,program,\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_Pyuno_PROGRAMDIRNAME),\
     $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,program/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_Pyuno_PROGRAMDIRNAME)/shell,\
     $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
diff --git a/desktop/Package_pagein_install.mk b/desktop/Package_pagein_install.mk
index afaff5c8298c..2ef1972eef92 100644
--- a/desktop/Package_pagein_install.mk
+++ b/desktop/Package_pagein_install.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_pagein_install,$(OUTDIR)/bin))
 
 $(eval $(call gb_Package_set_outdir,desktop_pagein_install,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,desktop_pagein_install,program,\
+$(eval $(call gb_Package_add_files,desktop_pagein_install,$(gb_Pyuno_PROGRAMDIRNAME),\
     pagein-calc \
     pagein-common \
     pagein-draw \
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