summaryrefslogtreecommitdiff
path: root/make/template
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2016-09-02 19:43:53 +0100
committerAttila Molnar <attilamolnar@hush.com>2016-09-02 22:13:22 +0200
commitb8d85c62517da91cf49428a419eca10cf82682f2 (patch)
treea3333756ed759aa1bed0b1362607f422cfe47f73 /make/template
parent458ea2029cf36e9e8d3c7b7d0176e365234c018a (diff)
Update stuff for the new versioning system.
Diffstat (limited to 'make/template')
-rw-r--r--make/template/config.h3
-rw-r--r--make/template/inspircd2
-rw-r--r--make/template/inspircd-genssl.12
-rw-r--r--make/template/inspircd.12
4 files changed, 4 insertions, 5 deletions
diff --git a/make/template/config.h b/make/template/config.h
index 513c550f5..660678b38 100644
--- a/make/template/config.h
+++ b/make/template/config.h
@@ -20,8 +20,7 @@
#pragma once
#define INSPIRCD_BRANCH "InspIRCd-@VERSION_MAJOR@.@VERSION_MINOR@"
-#define INSPIRCD_VERSION "InspIRCd-@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"
-#define INSPIRCD_REVISION "@VERSION_LABEL@"
+#define INSPIRCD_VERSION "InspIRCd-@VERSION_FULL@"
#define INSPIRCD_SYSTEM "@SYSTEM_NAME_VERSION@"
#define INSPIRCD_CONFIG_PATH "@CONFIG_DIR@"
diff --git a/make/template/inspircd b/make/template/inspircd
index cb2d2902d..949f85cee 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -55,7 +55,7 @@ my $runpath = "@BASE_DIR@";
my $datadir = "@DATA_DIR@";
my $valgrindlogpath = "$basepath/valgrindlogs";
my $executable = "inspircd";
-my $version = "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@";
+my $version = "@VERSION_FULL@";
my $uid = "@UID@";
if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1
index 4be5f394c..d43a3b4e8 100644
--- a/make/template/inspircd-genssl.1
+++ b/make/template/inspircd-genssl.1
@@ -17,7 +17,7 @@
.\"
-.TH "InspIRCd" "1" "June 2014" "InspIRCd @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@" "InspIRCd Manual"
+.TH "InspIRCd" "1" "June 2014" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
.SH "NAME"
\t\fBInspIRCd\fR - \fIthe\fR stable, high-performance and modular Internet Relay Chat Daemon
diff --git a/make/template/inspircd.1 b/make/template/inspircd.1
index 463db5c47..eb1453d2f 100644
--- a/make/template/inspircd.1
+++ b/make/template/inspircd.1
@@ -17,7 +17,7 @@
.\"
-.TH "InspIRCd" "1" "June 2014" "InspIRCd @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@" "InspIRCd Manual"
+.TH "InspIRCd" "1" "June 2014" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
.SH "NAME"
\t\fBInspIRCd\fR - \fIthe\fR stable, high-performance and modular Internet Relay Chat Daemon