From 9b0320c8b47c43adce1aa5d9821b67c1fa42e1d6 Mon Sep 17 00:00:00 2001
From: Roland Reichwein <mail@reichwein.it>
Date: Tue, 17 Jan 2023 19:48:26 +0100
Subject: v1.8 Build fix

---
 Makefile                | 2 +-
 plugins/fcgi/Makefile   | 4 ++--
 plugins/fcgi/socket.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8a1fd93..49f3b6e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ include common.mk
 
 VERSION=$(shell dpkg-parsechangelog --show-field Version)
 
-DISTROS=base debian11 ubuntu2204 ubuntu2210
+DISTROS=debian11 ubuntu2204 ubuntu2210
 PROJECTNAME=webserver
 TGZNAME=$(shell ls -t ../$(PROJECTNAME)-$(VERSION).tar.xz | head -n1 | sed -e 's,^../,,')
 PLUGINS= \
diff --git a/plugins/fcgi/Makefile b/plugins/fcgi/Makefile
index 81502c4..c597314 100644
--- a/plugins/fcgi/Makefile
+++ b/plugins/fcgi/Makefile
@@ -6,7 +6,7 @@ CXXFLAGS+= -fvisibility=hidden -fPIC
 
 CXXFLAGS+= -I../..
 
-LDLIBS=\
+LDLIBS+=\
 -lreichwein \
 -lboost_context \
 -lboost_coroutine \
@@ -30,7 +30,7 @@ SRC=$(PROGSRC)
 all: $(PROJECTNAME).so webapp-runner
 
 $(PROJECTNAME).so: $(SRC:.cpp=.o)
-	$(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@
 
 webapp-runner: webapp-runner.o fastcgiprocess.o
 	$(CXX) $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@
diff --git a/plugins/fcgi/socket.cpp b/plugins/fcgi/socket.cpp
index c899de5..7d607f6 100644
--- a/plugins/fcgi/socket.cpp
+++ b/plugins/fcgi/socket.cpp
@@ -246,7 +246,7 @@ std::string generate_unix_domain_socket(const std::string& directory)
 }
 
 FileSocketApp::FileSocketApp(const std::string& app_addr, boost::asio::io_context& io_context):
- m_socket_file{generate_unix_domain_socket("/var/lib/webserver")},
+ m_socket_file{generate_unix_domain_socket(fs::exists("/var/lib/webserver") ? "/var/lib/webserver" : ".")},
  m_fcgi_process{app_addr, m_socket_file},
  m_file_socket{m_socket_file, io_context}
 {
-- 
cgit v1.2.3