IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-03 12:00:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow "make clean" for OpenSSL, the bug was introduced in r2874

Browse Source
This commit is contained in:
Igor Sysoev 2009-09-28 12:24:09 +00:00
parent 00e723da20
commit 920c00dcb5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auto/lib/openssl/conf
View File

@ -25,10 +25,10 @@ if [ $OPENSSL != NONE ]; then
have=NGX_OPENSSL . auto/have have=NGX_OPENSSL . auto/have
have=NGX_SSL . auto/have have=NGX_SSL . auto/have
CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
CORE_LIBS="$CORE_LIBS $NGX_LIBDL" CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
;; ;;
esac esac

6
auto/lib/openssl/make
View File

@ -46,13 +46,13 @@ END
esac esac
case $OPENSSL in case $OPENSSL in
/*) ngx_prefix="$OPENSSL/openssl" ;; /*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
esac esac
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
$OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
cd $OPENSSL \\ cd $OPENSSL \\
&& \$(MAKE) clean \\ && \$(MAKE) clean \\
&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\