From 594c1d8bf7d871cfb0e87e084d828552c2bfd132 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 28 Jun 2014 23:16:14 +0800 Subject: [PATCH] fix ssl make install on ubuntu 14, change to make install_sw --- trunk/auto/depends.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 957b4e00b..0685b48df 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -495,7 +495,7 @@ if [ $SRS_SSL = YES ]; then ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS && make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \ LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && - make install && + make install_sw && cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp ) @@ -510,7 +510,7 @@ if [ $SRS_SSL = YES ]; then rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && ./config --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS && - make && make install && + make && make install_sw && cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp )