summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2013-03-28 08:47:25 +0000
committerRuslan Ermilov <ru@nginx.com>2013-03-28 08:47:25 +0000
commitf24f5f116fb58339cd418aa460cdee80b3a36768 (patch)
treeb7bc0c5da00a67bd7532abe4131ad86936a72b6d
parenta861b0dbb11a955f4957191b1ee7ee15c8e791a9 (diff)
downloadnginx-f24f5f116fb58339cd418aa460cdee80b3a36768.tar.gz
nginx-f24f5f116fb58339cd418aa460cdee80b3a36768.tar.bz2
Configure: unified nginx version computation constructs.
-rw-r--r--docs/GNUmakefile2
-rw-r--r--misc/GNUmakefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index 7c72b9171..cfa028998 100644
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -1,6 +1,6 @@
VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
- | sed -e 's/^.*\"\(.*\)\"/\1/')
+ | sed -e 's/^.*"\(.*\)".*/\1/')
NGINX= nginx-$(VER)
TEMP= tmp
CP= $(HOME)/java
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 373569650..31fe24cea 100644
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -1,6 +1,6 @@
VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
- | sed -e 's/^.*\"\(.*\)\"/\1/')
+ | sed -e 's/^.*"\(.*\)".*/\1/')
NGINX = nginx-$(VER)
TEMP = tmp
REPO = $(shell svn info | sed -n 's/^Repository Root: //p')