Nginx-ru mailing list archive (nginx-ru@sysoev.ru)
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] fixes empty $NGX_SBIN_PATH in the root Makefile
- To: Igor Sysoev <nginx-ru@xxxxxxxxx>
- Subject: [PATCH] fixes empty $NGX_SBIN_PATH in the root Makefile
- From: "Denis F. Latypoff" <denis@xxxxxxxxxx>
- Date: Sat, 16 May 2009 18:23:28 +0700
- Domainkey-signature: a=rsa-sha1; h=Received:Date:From:X-Mailer:Organization:X-Priority:Message-ID:To:Subject:MIME-Version:Content-Type; b=OPbdm/Rfx0hSjRheUYwk8ylFI9wPmyOCAa0DRI+IV4yePe+Wijbzcd6C2cFoGjTTMM+JdNLfBY+HvIj+oK4iWlEozOhI0MPKi0ocXoJRMJCv7+y9MmU7df59NXyoZ9JB; c=nofws; d=gostats.ru; q=dns; s=selector1
- Organization: GoStats.RU
Hello Igor,
Начиная с версии 0.7.53 сломался make upgrade. Патч.
--
Best regards,
Denis mailto:denis@xxxxxxxxxx diff -ru nginx-0.7.57/auto/init nginx-0.7.57.upgrade/auto/init
--- nginx-0.7.57/auto/init 2007-08-15 01:22:07.000000000 +0700
+++ nginx-0.7.57.upgrade/auto/init 2009-05-16 18:18:50.000000000 +0700
@@ -37,42 +37,3 @@
ngx_n=
ngx_c='\c'
fi
-
-
-# create Makefile
-
-cat << END > Makefile
-
-build:
- \$(MAKE) -f $NGX_MAKEFILE
-
-install:
- \$(MAKE) -f $NGX_MAKEFILE install
-
-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 -ru nginx-0.7.57/auto/install nginx-0.7.57.upgrade/auto/install
--- nginx-0.7.57/auto/install 2009-04-27 18:32:33.000000000 +0700
+++ nginx-0.7.57.upgrade/auto/install 2009-05-16 18:19:01.000000000 +0700
@@ -124,3 +124,42 @@
END
fi
+
+
+# create Makefile
+
+cat << END > Makefile
+
+build:
+ \$(MAKE) -f $NGX_MAKEFILE
+
+install:
+ \$(MAKE) -f $NGX_MAKEFILE install
+
+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
|