From 22d5430e570e034b196b694ab7d930a021cd875c Mon Sep 17 00:00:00 2001 From: Tijmen van Nesselrooij Date: Sat, 15 Jun 2019 12:09:02 +0200 Subject: [PATCH] Set default www-root to a relative path --- makefile | 2 +- src/server/configuration.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 10424fc..4a6f192 100644 --- a/makefile +++ b/makefile @@ -28,7 +28,7 @@ clean: check: ${BINARY_OUT} cp -uv $^ ./bin/ - ./bin/${BINARY_NAME} + cd ./bin/ && ./${BINARY_NAME} syntax: ${CPPS} ${CC} ${CFLAGS} -fsyntax-only $^ diff --git a/src/server/configuration.cpp b/src/server/configuration.cpp index 8d49656..81d655b 100644 --- a/src/server/configuration.cpp +++ b/src/server/configuration.cpp @@ -7,7 +7,7 @@ bool ServerConfiguration::LoadFromFile(std::string const & filePath) } ServerConfiguration::ServerConfiguration() - : wwwRoot("/home/tijmen/project/http-server/bin/www"), + : wwwRoot("./www"), serverName("http-server"), port(8080) {