From 280affbc4a74d544b5acfe75e752988a3d7f5683 Mon Sep 17 00:00:00 2001
From: Heikki Hannikainen <hessu@hes.iki.fi>
Date: Wed, 26 Jun 2013 07:53:29 +0300
Subject: [PATCH] Moved version number to a single file (VERSION) to ease up
 version bumping.

---
 src/Makefile.in | 1 +
 src/http.c      | 2 +-
 src/version.c   | 1 +
 src/version.h   | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index a620f28..1cf155c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -124,6 +124,7 @@ version_data.h:
 	@echo "/* generated automatically by Makefile - mark your branch in version_branch.h */" > version_data.h.new
 	@echo "#ifndef VERSIONDATA_H" >> version_data.h.new
 	@echo "#define VERSIONDATA_H" >> version_data.h.new
+	@echo "#define VERSION \"$(VERSION)\"" >> version_data.h.new
 	@echo "#define SRCVERSION \"$(SRCVERSION)\"" >> version_data.h.new
 	@echo "#define BUILD_TIME \"$(BUILD_TIME)\"" >> version_data.h.new
 	@echo "#define BUILD_USER \"$(BUILD_USER)\"" >> version_data.h.new
diff --git a/src/http.c b/src/http.c
index 888c3f6..89265d9 100644
--- a/src/http.c
+++ b/src/http.c
@@ -156,7 +156,7 @@ static void http_header_base(struct evkeyvalq *headers, int last_modified)
 	
 	http_date(dbuf, sizeof(dbuf), tick);
 	
-	evhttp_add_header(headers, "Server", PROGNAME "/" VERSION);
+	evhttp_add_header(headers, "Server", verstr_http);
 	evhttp_add_header(headers, "Date", dbuf);
 	
 	if (last_modified) {
diff --git a/src/version.c b/src/version.c
index 6ca4815..be32790 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,6 +9,7 @@
 const char version_build[] = VERSION "-" SRCVERSION VERSION_BRANCH;
 const char verstr[]        = PROGNAME " " VERSION "-" SRCVERSION VERSION_BRANCH;
 const char verstr_aprsis[] = PROGNAME " " VERSION "-" SRCVERSION VERSION_BRANCH;
+const char verstr_http[] = PROGNAME "/" VERSION;
 
 const char verstr_build_time[] = BUILD_TIME;
 const char verstr_build_user[] = BUILD_USER;
diff --git a/src/version.h b/src/version.h
index 50e49e2..3d9771a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -8,17 +8,17 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-/* Mainline version number - please don't modify this.
+/*
  * If you're making modifications, put your own variant version
  * identification in version_branch.h. Thanks!
  */
-#define VERSION "2.0.5"
 
 #define APRSC_TOCALL "APSC20"
 
 extern const char version_build[];
 extern const char verstr[];
 extern const char verstr_aprsis[];
+extern const char verstr_http[];
 extern const char verstr_build_time[];
 extern const char verstr_build_user[];
 extern const char verstr_features[];