IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix "make upgrade" broken in r2759

Browse Source
This commit is contained in:
Igor Sysoev
2009-05-17 19:22:08 +00:00
parent 7f20c49059
commit 419c736ae8
2 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
auto/init
View File

@@ -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

36
auto/install
View File

@@ -124,3 +124,39 @@ if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then
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