[Libreoffice-commits] avoid 'else ifeq' construct in make

[Stephan Bergmann]

On 11/04/2012 02:17 PM, Libreoffice Gerrit user wrote:
> commit 198a18b246ac8105cd868138e0ba172f8e83c0d5
> Author: Norbert Thiebaud <nthiebaud at gmail.com>
> Date:   Sun Nov 4 07:13:50 2012 -0600
>
>      avoid 'else ifeq' construct in make

why?

Stephan

>      Change-Id: I075313f99c88241348a9c1184d1e1a54de6154cc
>
> diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
> index d63287d..7fcf0c2 100644
> --- a/lpsolve/ExternalPackage_lpsolve.mk
> +++ b/lpsolve/ExternalPackage_lpsolve.mk
> @@ -20,14 +20,15 @@ $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
>   endif # $(COM)
>   $(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
>   else # $(GUI)
> -
>   ifeq ($(OS),MACOSX)
>   $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
> -else ifeq ($(DISABLE_DYNLOADING),TRUE)
> +else # $(OS)
> +ifeq ($(DISABLE_DYNLOADING),TRUE)
>   $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
> -else
> +else # DISABLE_DYNLOADING
>   $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so))
> +endif # $(DISABLE_DYNLOADING)
>   endif # $(OS)
> -
>   endif # $(GUI)
> +
>   # vim: set noet sw=4 ts=4: