From 608e09e9def182756e2f1650c6f3416b209fbf58 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <alexander.borisov@nginx.com>
Date: Fri, 22 Feb 2019 16:31:44 +0300
Subject: Improvement and unification of version processing in build scripts.

This also eliminates expressions that incompatible with BSD make, thus fixing
installation of Node.js module on FreeBSD (broken by dace60fc4926).
---
 src/nodejs/unit-http/unit.h | 2 +-
 src/nxt_main.h              | 5 +----
 src/nxt_unit.h              | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/nodejs/unit-http/unit.h b/src/nodejs/unit-http/unit.h
index 8baeb967..db85e85c 100644
--- a/src/nodejs/unit-http/unit.h
+++ b/src/nodejs/unit-http/unit.h
@@ -15,7 +15,7 @@ extern "C" {
 #include "version.h"
 #include <nxt_unit.h>
 
-#if NXT_UNIT_VERNUM != NXT_NODE_VERNUM
+#if NXT_VERNUM != NXT_NODE_VERNUM
 #error "libunit version mismatch."
 #endif
 
diff --git a/src/nxt_main.h b/src/nxt_main.h
index dc821e07..23c55002 100644
--- a/src/nxt_main.h
+++ b/src/nxt_main.h
@@ -9,10 +9,7 @@
 
 
 #include <nxt_auto_config.h>
-
-
-#define NXT_VERSION                  "1.8"
-#define NXT_VERNUM                   10800
+#include <nxt_version.h>
 
 #define NXT_SERVER                   "Unit/" NXT_VERSION
 
diff --git a/src/nxt_unit.h b/src/nxt_unit.h
index a3fcc541..532de20d 100644
--- a/src/nxt_unit.h
+++ b/src/nxt_unit.h
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "nxt_unit_version.h"
+#include "nxt_version.h"
 #include "nxt_unit_typedefs.h"
 
 
-- 
cgit