fix "make upgrade" broken in r2759

diff --git a/auto/init b/auto/init
index e180441144440521869ce58a74a2564a0741efa0..56ecb1908d8a8cd8889cc4eeeb1545ff1b0663d2 100644 (file)
--- 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
index 91f971032df45e1bcfbe259192caeb05837a9a68..c17dac61270fef62a72f72b1fb74964a22753880 100644 (file)
--- a/auto/install
+++ b/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