the program dir is called MacOS on MacOS X

program is only a symlink to it there, created by the installer.

(Hmm, would it be possible to have MacOS symlink to program instead? It
would simplify things :-)

Change-Id: If21df47da5ac7c77358656f40d9caaaa62a7e87f

moz/ExternalPackage_runtime.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime))
 
 $(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,program,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(gb_Package_PROGRAMDIRNAME),\
 	components/addrbook.dll \
 	components/addrbook.xpt \
 	components/i18n.dll \

python3/GeneratedPackage_python3.mk

@@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))
 
 $(eval $(call gb_GeneratedPackage_use_external_project,python3,python3))
 
-$(eval $(call gb_GeneratedPackage_add_dir,python3,program/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(gb_Package_PROGRAMDIRNAME)/LibreOfficePython.framework,LibreOfficePython.framework))
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/ExternalPackage.mk

@@ -231,7 +231,7 @@ endef
 #
 # gb_ExternalPackage_add_library_for_install package dest src library?
 define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),program)/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
 
 endef
 
@@ -251,7 +251,7 @@ endef
 #
 # gb_ExternalPackage_add_jar_for_install package dest src
 define gb_ExternalPackage_add_jar_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),program/classes/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
 
 endef
 

solenv/gbuild/Package.mk

@@ -57,6 +57,7 @@ endef
 # Package class
 
 # defined by platform
+#  gb_Package_PROGRAMDIRNAME
 #  gb_Package_SDKDIRNAME
 
 $(dir $(call gb_Package_get_target,%)).dir :

solenv/gbuild/platform/IOS_ARM_GCC.mk

@@ -280,6 +280,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := program
 gb_Package_SDKDIRNAME := sdk
 
 # UIMenubarTarget class

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -415,6 +415,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := program
 gb_Package_SDKDIRNAME := sdk
 
 # UIMenubarTarget class

solenv/gbuild/platform/com_MSC_class.mk

@@ -589,6 +589,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := program
 gb_Package_SDKDIRNAME := sdk
 
 # UIMenubarTarget class

solenv/gbuild/platform/macosx.mk

@@ -387,6 +387,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := MacOS
 gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK
 
 # UIMenubarTarget class

solenv/gbuild/platform/solaris.mk

@@ -422,6 +422,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := program
 gb_Package_SDKDIRNAME := sdk
 
 # UIMenubarTarget class

solenv/gbuild/platform/unxgcc.mk

@@ -421,6 +421,7 @@ gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 # Package class
+gb_Package_PROGRAMDIRNAME := program
 gb_Package_SDKDIRNAME := sdk
 
 # UIMenubarTarget class