diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-13 16:33:43 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-13 18:32:11 +0200 |
| commit | 20feaeed7e410fc0c79dedd14041e0c4f6241973 (patch) | |
| tree | a46d920d663b7652159e297fa2009abeee5619ac /solenv | |
| parent | 553084d4842c5e4488e1d28d3cbd20798fd906b0 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalPackage.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Package.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 1 |
8 files changed, 9 insertions, 2 deletions
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index ab2cd267240e..1a2abefaf664 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/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 diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index a5ecf379c01b..dc5b44121b3a 100644 --- a/solenv/gbuild/Package.mk +++ b/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 : diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index e52563968790..59d07b00018a 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/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 diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 77fe838e69e5..f1f7e5b96777 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/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 diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1c461fce5af5..1ea04664696b 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/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 diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 1f123f10f473..eb03018d7686 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/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 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 96b2c53b18e1..945f410ea52f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/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 diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9169c0fe538d..4f1e356d0190 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/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 |