summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRoland Reichwein <mail@reichwein.it>2022-11-04 17:30:29 +0100
committerRoland Reichwein <mail@reichwein.it>2022-11-04 17:30:29 +0100
commitf3d667866711b3eb4b89125ba6e6597a45cd16d9 (patch)
tree858f1d82c8b1408e0db472321e3f5a2fee06e1b3
parentb4cfb3a4d788d999c737d35ff5da632ffd173f7b (diff)
Fixed year handling
-rw-r--r--Makefile3
-rw-r--r--common.mk3
-rw-r--r--debian/changelog6
3 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 14f1778..87d9240 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ VERSION=$(shell dpkg-parsechangelog --show-field Version)
DISTROS=base base-i386 debian10 debian11 ubuntu2004 ubuntu2204
PROJECTNAME=webserver
TGZNAME=$(shell ls -t ../webserver-*.tar.xz | head -n1 | sed -e 's,^../,,')
-YEAR=$(shell date +"%Y")
PLUGINS= \
cgi \
fcgi \
@@ -15,7 +14,7 @@ PLUGINS= \
webbox \
weblog
-CXXFLAGS+=-fPIE -DVERSION=\"$(VERSION)\" -DYEAR=\"$(YEAR)\"
+CXXFLAGS+=-fPIE -DVERSION=\"$(VERSION)\"
LDLIBS+=\
-lcommon \
diff --git a/common.mk b/common.mk
index 0a874b8..8df3809 100644
--- a/common.mk
+++ b/common.mk
@@ -45,6 +45,9 @@ endif
CXXFLAGS+=-Wall -I.
+YEAR=$(shell date +"%Y")
+CXXFLAGS+=-DYEAR=\"$(YEAR)\"
+
CXXFLAGS+=-pthread
ifeq ($(CXX),clang++-11)
CXXFLAGS+=-std=c++20 #-stdlib=libc++
diff --git a/debian/changelog b/debian/changelog
index deffcff..ef62294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webserver (1.17) unstable; urgency=medium
+
+ * Automated date handling (year)
+
+ -- Roland Reichwein <mail@reichwein.it> Fri, 04 Nov 2022 17:16:39 +0100
+
webserver (1.16) unstable; urgency=medium
* Support CGIT via CGI