# HG changeset patch # User Igor Sysoev # Date 1242588128 0 # Node ID 4e05bd832e56f3479f608f91e9137e4bcc71e412 # Parent 6a62bed048cd1441d1b6d247752b640a8a42a8f4 fix "make upgrade" broken in r2759 diff --git a/auto/init b/auto/init --- 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 diff --git a/auto/install b/auto/install --- 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