diff options
| author | horus_arch | 2015-04-07 21:31:10 +0200 |
|---|---|---|
| committer | horus_arch | 2015-04-07 21:31:10 +0200 |
| commit | f5423fe5dda9da1674d788e4502efe0ef799d04c (patch) | |
| tree | 3539672b7aec6f370324737145ba89722be27e6f | |
| parent | 86a5ee388097692fa0a5d7fc79ec1e4967c8a4d1 (diff) | |
| parent | ad198cc4030f31ba769bbb544b5fce5d6c1d06ef (diff) | |
| download | nginx-build-f5423fe5dda9da1674d788e4502efe0ef799d04c.tar.gz | |
Merge branch 'dev' of git.iamfabulous.de:nginx-build into dev
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -88,7 +88,7 @@ build: --add-module=./set-misc-nginx-module \ --add-module=./nginx-statsd $(NGX_CONFIGURE) cd $(BUILD_DIR)/ && \ - make -j $(grep -c processor /proc/cpuinfo) + bash -c "make -j $$(grep -c processor /proc/cpuinfo)" install: cd $(BUILD_DIR)/ && make install @@ -120,5 +120,5 @@ 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. 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 "'make install' will install it system wide (needs root privileges)." @echo "If you are on GNU/Debian, you can run 'make prepare' to install some needed libraries." |