diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 06:47:02 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 12:26:30 +0100 |
| commit | ed1aa172f8807ee479e4f529df49d19c13a8bc86 (patch) | |
| tree | 61352b390a5be1575d5c07b509b26889187cc90a /desktop | |
| parent | 92a90cf5ccb998d2fcc77a62bb971534e410cdec (diff) | |
Unify condition names and fix "else" paths
Drop Build prefix and settle on Lib and Exe prefixes. Also add a
note about the "else" part of the condition and fix offenders.
While at it, define COND_LIB_SAL_TEXTENC to be used by sal to
prevent diverting coditions in build and cxx code.
Change-Id: I944587ca1ccbe46b765d1a631a7214c8126fe951
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128136
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Module_desktop.mk | 6 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 67ba27fbe2f0..15b2ad358d64 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -33,11 +33,11 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ Executable_soffice_bin \ - $(call gb_CondBuildUnopkg,Executable_unopkg_bin) \ + $(call gb_CondExeUnopkg,Executable_unopkg_bin) \ $(if $(ENABLE_BREAKPAD),Executable_minidump_upload) \ Library_migrationoo2 \ Library_migrationoo3 \ - $(call gb_CondBuildUnopkg,Library_unopkgapp) \ + $(call gb_CondExeUnopkg,Library_unopkgapp) \ Package_scripts \ $(if $(ENABLE_PAGEIN), \ Pagein_calc \ @@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Executable_sweb \ Executable_swriter \ Executable_unoinfo \ - $(call gb_CondBuildUnopkg, \ + $(call gb_CondExeUnopkg, \ Executable_unopkg \ Executable_unopkg_com \ ) \ diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 0c9b1c3ec648..248665595ee6 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip ifeq (,$(filter MACOSX WNT,$(OS))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace)) -ifneq (,$(call gb_CondBuildUnopkg,$(true))) +ifneq (,$(call gb_CondExeUnopkg,$(true))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh)) endif |