aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/httpd/Makefile3
-rw-r--r--src/benchmarks/httpd/nginx/nginx.conf2
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 {