[PATCH] Configure: call "make clean" for OpenSSL only if Makefile exists.

Maxim Dounin mdounin at mdounin.ru
Tue Nov 5 16:30:53 UTC 2013


Hello!

On Mon, Nov 04, 2013 at 05:07:03PM -0800, Piotr Sikora wrote:

> # HG changeset patch
> # User Piotr Sikora <piotr at cloudflare.com>
> # Date 1383613225 28800
> #      Mon Nov 04 17:00:25 2013 -0800
> # Node ID 6d03c58d4b1c3fdd87f42a9ceaf8daa68d11365a
> # Parent  dea321e5c0216efccbb23e84bbce7cf3e28f130c
> Configure: call "make clean" for OpenSSL only if Makefile exists.
> 
> This change allows to build nginx against git checkout of OpenSSL.
> 
> Signed-off-by: Piotr Sikora <piotr at cloudflare.com>
> 
> diff -r dea321e5c021 -r 6d03c58d4b1c auto/lib/openssl/make
> --- a/auto/lib/openssl/make Thu Oct 31 18:23:49 2013 +0400
> +++ b/auto/lib/openssl/make Mon Nov 04 17:00:25 2013 -0800
> @@ -55,7 +55,7 @@ END
> 
>  $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
>   cd $OPENSSL \\
> - && \$(MAKE) clean \\
> + && if [ -f Makefile ]; then \$(MAKE) clean; fi \\
>   && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
>   && \$(MAKE) \\
>   && \$(MAKE) install LIBDIR=lib

Committed, thanks.

-- 
Maxim Dounin
http://nginx.org/en/donation.html



More information about the nginx-devel mailing list