[Libreoffice-commits] core.git: odk/settings

[Mike Kaganski (via logerrit)]

 odk/settings/platform.mk |   66 ++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 43 deletions(-)

New commits:
commit 5af26c9ecdcfe70f5954c4acc340e8f9846aacfe
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Oct 23 20:12:07 2022 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Oct 23 22:15:48 2022 +0200

    Avoid nesting using 'else conditional-directive'
    
    See https://www.gnu.org/software/make/manual/make.html#Conditional-Syntax
    
    Change-Id: Iddd4ee2d42c83e6d661ef7d91c93a06caf307001
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141708
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index feffff3aab26..ea3a0ed01380 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -25,48 +25,28 @@
 # only make version 3.81 or later accepts the multiple else conditions
 ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86"
     EXTENSION_PLATFORM=freebsd_x86
-else
-    ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86_64"
-        EXTENSION_PLATFORM=freebsd_x86_64
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Linux_PowerPC"
-        EXTENSION_PLATFORM=linux_powerpc
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Linux_x86"
-        EXTENSION_PLATFORM=linux_x86
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Linux_x86_64"
-        EXTENSION_PLATFORM=linux_x86_64
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "MacOSX_PowerPC"
-        EXTENSION_PLATFORM=macosx_powerpc
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
-        EXTENSION_PLATFORM=macosx_x86
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
-        EXTENSION_PLATFORM=macosx_x86_64
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
-        EXTENSION_PLATFORM=solaris_sparc
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Solaris_x86"
-        EXTENSION_PLATFORM=solaris_x86
-    else
-    ifeq "$(UNOPKG_PLATFORM)" "Windows"
-        ifeq "$(PROCTYPE)" "x86_64"
-            EXTENSION_PLATFORM=windows_x86_64
-        else
-            EXTENSION_PLATFORM=windows_x86
-        endif
-    endif
-    endif
-    endif
-    endif
-    endif
-    endif
-    endif
-    endif
-    endif
+else ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86_64"
+    EXTENSION_PLATFORM=freebsd_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_PowerPC"
+    EXTENSION_PLATFORM=linux_powerpc
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_x86"
+    EXTENSION_PLATFORM=linux_x86
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_x86_64"
+    EXTENSION_PLATFORM=linux_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_PowerPC"
+    EXTENSION_PLATFORM=macosx_powerpc
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
+    EXTENSION_PLATFORM=macosx_x86
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
+    EXTENSION_PLATFORM=macosx_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
+    EXTENSION_PLATFORM=solaris_sparc
+else ifeq "$(UNOPKG_PLATFORM)" "Solaris_x86"
+    EXTENSION_PLATFORM=solaris_x86
+else ifeq "$(UNOPKG_PLATFORM)" "Windows"
+    ifeq "$(PROCTYPE)" "x86_64"
+        EXTENSION_PLATFORM=windows_x86_64
+    else
+        EXTENSION_PLATFORM=windows_x86
     endif
 endif