diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2019-04-13 16:55:59 +0200 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2019-04-13 16:55:59 +0200 |
| commit | 47b6769088d2e3a1f51f3c11c8e402645d0d9650 (patch) | |
| tree | 2e8883ee3c146c7539977324b4e2c012e713cf53 | |
| parent | fa8bc15ea5324c8f547bd1696869629000a4e666 (diff) | |
| download | allocbench-47b6769088d2e3a1f51f3c11c8e402645d0d9650.tar.gz allocbench-47b6769088d2e3a1f51f3c11c8e402645d0d9650.zip | |
improve httpd Makefile and config
| -rw-r--r-- | src/benchmarks/httpd/Makefile | 3 | ||||
| -rw-r--r-- | src/benchmarks/httpd/nginx/nginx.conf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/benchmarks/httpd/Makefile b/src/benchmarks/httpd/Makefile index 572f3e6..6175d59 100644 --- a/src/benchmarks/httpd/Makefile +++ b/src/benchmarks/httpd/Makefile @@ -8,8 +8,7 @@ $(OBJDIR)/html: html | $(OBJDIR) cp -r html $(OBJDIR)/html $(OBJDIR)/nginx: nginx/nginx.conf | $(OBJDIR) - mkdir $@ - mkdir $@/logs + mkdir -p $@/logs sed "s|OBJDIR|$(OBJDIR)|" $< > $@/nginx.conf $(OBJDIR): diff --git a/src/benchmarks/httpd/nginx/nginx.conf b/src/benchmarks/httpd/nginx/nginx.conf index 988639e..cf4b4d0 100644 --- a/src/benchmarks/httpd/nginx/nginx.conf +++ b/src/benchmarks/httpd/nginx/nginx.conf @@ -6,7 +6,7 @@ error_log OBJDIR/nginx/logs/error.log; error_log OBJDIR/nginx/logs/error.log notice; error_log OBJDIR/nginx/logs/error.log info; -pid OBJDIR/nginx/logs/nginx.pid; +pid OBJDIR/nginx/nginx.pid; events { |