mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
fix "make upgrade" broken in r2759
This commit is contained in:
parent
7f20c49059
commit
419c736ae8
30
auto/init
30
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
|
||||
|
36
auto/install
36
auto/install
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user