external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug #64: install_dir=DESTDIR+PREFIX

Browse source
This commit is contained in:
winlin 2014-05-12 12:56:58 +08:00
parent 6015744ad8
commit 1a1527a857
2 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

49
trunk/configure vendored
View file

@ -202,7 +202,7 @@ cat << END > ${SRS_MAKEFILE}
# install prefix. # install prefix.
SRS_PREFIX=${SRS_PREFIX} SRS_PREFIX=${SRS_PREFIX}
DESTDIR=\$(SRS_PREFIX) __REAL_INSTALL=\$(DESTDIR)\$(SRS_PREFIX)
END END
@ -260,22 +260,22 @@ uninstall:
@rm -rf \$(SRS_PREFIX) @rm -rf \$(SRS_PREFIX)
install-api: install install-api: install
@echo "mkdir \$(DESTDIR)" @echo "mkdir \$(__REAL_INSTALL)"
@mkdir -p \$(DESTDIR) @mkdir -p \$(__REAL_INSTALL)
@echo "copy binary files" @echo "copy binary files"
@mkdir -p \$(DESTDIR)/research/api-server @mkdir -p \$(__REAL_INSTALL)/research/api-server
@cp research/api-server/server.py \$(DESTDIR)/research/api-server @cp research/api-server/server.py \$(__REAL_INSTALL)/research/api-server
@mkdir -p \$(DESTDIR)/objs/ffmpeg/bin @mkdir -p \$(__REAL_INSTALL)/objs/ffmpeg/bin
@cp objs/ffmpeg/bin/ffmpeg \$(DESTDIR)/objs/ffmpeg/bin @cp objs/ffmpeg/bin/ffmpeg \$(__REAL_INSTALL)/objs/ffmpeg/bin
@echo "copy html files" @echo "copy html files"
@mkdir -p \$(DESTDIR)/research/api-server/static-dir/players @mkdir -p \$(__REAL_INSTALL)/research/api-server/static-dir/players
@cp research/api-server/static-dir/crossdomain.xml \$(DESTDIR)/research/api-server/static-dir @cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/research/api-server/static-dir
@cp research/api-server/static-dir/index.html \$(DESTDIR)/research/api-server/static-dir @cp research/api-server/static-dir/index.html \$(__REAL_INSTALL)/research/api-server/static-dir
@cp -r research/api-server/static-dir/players/* \$(DESTDIR)/research/api-server/static-dir/players @cp -r research/api-server/static-dir/players/* \$(__REAL_INSTALL)/research/api-server/static-dir/players
@echo "copy init.d script files" @echo "copy init.d script files"
@mkdir -p \$(DESTDIR)/etc/init.d @mkdir -p \$(__REAL_INSTALL)/etc/init.d
@cp etc/init.d/srs-api \$(DESTDIR)/etc/init.d @cp etc/init.d/srs-api \$(__REAL_INSTALL)/etc/init.d
@sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(DESTDIR)/etc/init.d/srs-api @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs-api
@echo "" @echo ""
@echo "api installed, to link and start api:" @echo "api installed, to link and start api:"
@echo " sudo ln -sf /usr/local/srs/etc/init.d/srs-api /etc/init.d/srs-api" @echo " sudo ln -sf /usr/local/srs/etc/init.d/srs-api /etc/init.d/srs-api"
@ -284,20 +284,21 @@ install-api: install
@echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService" @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService"
install: install:
@echo "mkdir \$(DESTDIR)" @echo "mkdir \$(__REAL_INSTALL)"
@mkdir -p \$(DESTDIR) @mkdir -p \$(__REAL_INSTALL)
@echo "make the http root dir" @echo "make the http root dir"
@mkdir -p \$(DESTDIR)/objs/nginx/html @mkdir -p \$(__REAL_INSTALL)/objs/nginx/html
@cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html
@echo "copy binary files" @echo "copy binary files"
@mkdir -p \$(DESTDIR)/objs @mkdir -p \$(__REAL_INSTALL)/objs
@cp objs/srs \$(DESTDIR)/objs @cp objs/srs \$(__REAL_INSTALL)/objs
@echo "copy srs conf files" @echo "copy srs conf files"
@mkdir -p \$(DESTDIR)/conf @mkdir -p \$(__REAL_INSTALL)/conf
@cp conf/*.conf \$(DESTDIR)/conf @cp conf/*.conf \$(__REAL_INSTALL)/conf
@echo "copy init.d script files" @echo "copy init.d script files"
@mkdir -p \$(DESTDIR)/etc/init.d @mkdir -p \$(__REAL_INSTALL)/etc/init.d
@cp etc/init.d/srs \$(DESTDIR)/etc/init.d @cp etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d
@sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(DESTDIR)/etc/init.d/srs @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs
@echo "" @echo ""
@echo "srs installed, to link and start srs:" @echo "srs installed, to link and start srs:"
@echo " sudo ln -sf /usr/local/srs/etc/init.d/srs /etc/init.d/srs" @echo " sudo ln -sf /usr/local/srs/etc/init.d/srs /etc/init.d/srs"

8
trunk/scripts/install.sh
View file

@ -53,7 +53,7 @@ ok_msg "old srs backuped"
# prepare files. # prepare files.
ok_msg "prepare files" ok_msg "prepare files"
( (
sed -i "s|^ROOT=.*|ROOT=\"${INSTALL}\"|g" $work_dir/etc/init.d/srs sed -i "s|^ROOT=.*|ROOT=\"${INSTALL}\"|g" $work_dir/${INSTALL}/etc/init.d/srs
) >> $log 2>&1 ) >> $log 2>&1
ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "prepare files failed"; exit $ret; fi ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "prepare files failed"; exit $ret; fi
ok_msg "prepare files success" ok_msg "prepare files success"
@ -62,9 +62,9 @@ ok_msg "prepare files success"
ok_msg "copy core components" ok_msg "copy core components"
( (
mkdir -p $install_root mkdir -p $install_root
cp -r $work_dir/conf $install_root && cp -r $work_dir/${INSTALL}/conf $install_root &&
cp -r $work_dir/etc $install_root && cp -r $work_dir/${INSTALL}/etc $install_root &&
cp -r $work_dir/objs $install_root cp -r $work_dir/${INSTALL}/objs $install_root
) >>$log 2>&1 ) >>$log 2>&1
ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "copy core components failed"; exit $ret; fi ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "copy core components failed"; exit $ret; fi
ok_msg "copy core components success" ok_msg "copy core components success"