Merge branch '2.0release' into develop

winlin
Commit 8b6c78b862f2d218853e470132a2a0f336dd0c7c 8b6c78b8 2 parents 396bb436 d1de097f
trunk/configure
--- a/trunk/configure
查看文件 @8b6c78b
+++ b/trunk/configure
查看文件 @8b6c78b
@@ -328,11 +328,11 @@ help:
 	@echo "     make help"
 
 clean: 
- 	(cd ${SRS_OBJS_DIR}; rm -rf srs srs_utest $__mcleanups)
- 	(cd ${SRS_OBJS_DIR}; rm -rf src include lib)
- 	(cd ${SRS_OBJS_DIR}/utest; rm -rf *.o *.a)
- 	(cd research/librtmp; make clean)
- 	(cd research/api-server/static-dir; rm -rf crossdomain.xml forward live players)
+ 	(cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest $__mcleanups)
+ 	(cd ${SRS_OBJS_DIR} && rm -rf src include lib)
+ 	(cd ${SRS_OBJS_DIR}/utest && rm -rf *.o *.a)
+ 	(cd research/librtmp && make clean)
+ 	(cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players)
 
 END