summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorus_arch2015-03-18 17:36:19 +0100
committerhorus_arch2015-03-18 17:36:19 +0100
commit688bc1e52bb01bf44bd7425bf23e6804f84f8de2 (patch)
tree815197f28da67944afa04bc93c97c9c923234554
parent0fa068bac22d02a25c7c7177c64ce30a80f01689 (diff)
downloadnginx-build-688bc1e52bb01bf44bd7425bf23e6804f84f8de2.tar.gz
Run make with -j option and add options to configure from the command line.
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ee24043..d91f9ca 100644
--- a/Makefile
+++ b/Makefile
@@ -84,8 +84,9 @@ build:
--with-ld-opt=-lossp-uuid \
--add-module=./nginx-x-rid-header \
--add-module=./redis2-nginx-module \
- --add-module=./nginx-statsd
- cd $(BUILD_DIR)/ && make
+ --add-module=./nginx-statsd $(NGX_CONFIGURE)
+ cd $(BUILD_DIR)/ && \
+ make -j $(grep -c processor /proc/cpuinfo)
install:
cd $(BUILD_DIR)/ && make install
@@ -116,6 +117,6 @@ pagespeed:
help:
@echo "This is a Makefile to automatize compiling nginx from source.\n"
@echo "Run 'make fetch' to fetch the core and addons."
- @echo "Run 'make build' to configure and compile nginx."
+ @echo "Run 'make build' to configure and compile nginx. If you want to pass options to ./configure you can do this with 'NGX_CONFIGURE=options... make build' on the commmand line."
@echo "'make install' will install it system wide (needs root previleges)."
@echo "If you are on GNU/Debian, you can run 'make prepare' to install some needed libraries."