From 47b6769088d2e3a1f51f3c11c8e402645d0d9650 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Sat, 13 Apr 2019 16:55:59 +0200
Subject: improve httpd Makefile and config

---
 src/benchmarks/httpd/Makefile         | 3 +--
 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 {
-- 
cgit v1.2.3