Mercurial > hg > nginx-quic
changeset 2850:4e05bd832e56
fix "make upgrade" broken in r2759
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 17 May 2009 19:22:08 +0000 |
parents | 6a62bed048cd |
children | d791586bb149 |
files | auto/init auto/install |
diffstat | 2 files changed, 37 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/init +++ b/auto/init @@ -43,36 +43,8 @@ fi cat << END > Makefile -build: - \$(MAKE) -f $NGX_MAKEFILE - -install: - \$(MAKE) -f $NGX_MAKEFILE install +default: build clean: rm -rf Makefile $NGX_OBJS - -upgrade: - $NGX_SBIN_PATH -t - - kill -USR2 \`cat $NGX_PID_PATH\` - sleep 1 - test -f $NGX_PID_PATH.oldbin - - kill -QUIT \`cat $NGX_PID_PATH.oldbin\` - -upgrade1: - # upgrade 0.1.x to 0.2+ - - $NGX_SBIN_PATH -t - - cp $NGX_PID_PATH $NGX_PID_PATH.oldbin - - kill -USR2 \`cat $NGX_PID_PATH\` - sleep 1 - test -f $NGX_PID_PATH.oldbin - - cp $NGX_PID_PATH $NGX_PID_PATH.newbin - - kill -QUIT \`cat $NGX_PID_PATH.oldbin\` END
--- a/auto/install +++ b/auto/install @@ -124,3 +124,39 @@ if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PA END fi + + +# create Makefile + +cat << END >> Makefile + +build: + \$(MAKE) -f $NGX_MAKEFILE + +install: + \$(MAKE) -f $NGX_MAKEFILE install + +upgrade: + $NGX_SBIN_PATH -t + + kill -USR2 \`cat $NGX_PID_PATH\` + sleep 1 + test -f $NGX_PID_PATH.oldbin + + kill -QUIT \`cat $NGX_PID_PATH.oldbin\` + +upgrade1: + # upgrade 0.1.x to 0.2+ + + $NGX_SBIN_PATH -t + + cp $NGX_PID_PATH $NGX_PID_PATH.oldbin + + kill -USR2 \`cat $NGX_PID_PATH\` + sleep 1 + test -f $NGX_PID_PATH.oldbin + + cp $NGX_PID_PATH $NGX_PID_PATH.newbin + + kill -QUIT \`cat $NGX_PID_PATH.oldbin\` +END