summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorus32015-04-08 01:21:31 +0200
committerHorus32015-04-08 01:21:31 +0200
commit94feb31e515f305dbe0ce15b795fdb6d71cc2d0c (patch)
treeb6487b425bff48599a0feb02094499af61b48795
parent927b1e465c3254bdde72bd77cb306a70f596c4c5 (diff)
downloadnginx-build-dev.tar.gz
Merge with branch master to stay up to date.dev
-rw-r--r--Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3ce4d87..2d087e7 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,6 @@ fetch_dep:
cd $(BUILD_DIR) && git clone https://github.com/newobj/nginx-x-rid-header
cd $(BUILD_DIR) && git clone https://github.com/openresty/set-misc-nginx-module
cd $(BUILD_DIR) && git clone https://github.com/openresty/redis2-nginx-module
- cd $(BUILD_DIR) && git clone https://github.com/openresty/set-misc-nginx-module
mkdir $(BUILD_DIR)/nginx-syslog && wget -O $(BUILD_DIR)/nginx-syslog/config https://raw.githubusercontent.com/gplessis/dotdeb-nginx/wheezy/debian/modules/nginx-syslog/config
build:
@@ -97,7 +96,6 @@ build:
--add-module=./nginx-x-rid-header \
--add-module=./set-misc-nginx-module \
--add-module=./redis2-nginx-module \
- --add-module=./set-misc-nginx-module \
--add-module=./nginx-statsd $(NGX_CONFIGURE)
cd $(BUILD_DIR)/ && \
bash -c "make -j $$(grep -c processor /proc/cpuinfo)"